cbmem: use boot state machine

There were previously 2 functions, init_cbmem_pre_device() and
init_cbmem_post_device(), where the 2 cbmem implementations
implemented one or the other. These 2 functions are no longer
needed to be called in the boot flow once the boot state callbacks
are utilized.

Change-Id: Ida71f1187bdcc640ae600705ddb3517e1410a80d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/3136
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

1 files changed, 0 insertions, 3 deletions

diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index e4b2659515..dc2afa43a8 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -97,7 +97,6 @@ static struct boot_state boot_states[] = {
 
 static boot_state_t bs_pre_device(void *arg)
 {
-	init_cbmem_pre_device();
 	return BS_DEV_INIT_CHIPS;
 }
 
@@ -154,8 +153,6 @@ static boot_state_t bs_post_device(void *arg)
 {
 	timestamp_stash(TS_DEVICE_DONE);
 
-	init_cbmem_post_device();
-
 	timestamp_sync();
 
 	return BS_OS_RESUME_CHECK;