commit 71b214553c952e790219864767ba7882c9aaae1f
author Kyösti Mälkki <kyosti.malkki@gmail.com> Fri Nov 28 10:13:03 2014 +0200
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Dec 16 20:41:02 2014 +0100
tree f9168f6214f9ab33afc28d116dddf07c68717c58
parent 13a845acb3aee15dad1b4d66027731baba659e0e

CBMEM console: Fix boards with BROKEN_CAR_MIGRATE

There is no need to call cbmemc_reinit() exclusively in romstage,
that is done as part of the CAR migration of cbmem_recovery().

CBMEM console for romstage remains disabled for boards flagged with
BROKEN_CAR_MIGRATE, but with this change it is possible to have it for
ramstage.

Change-Id: I48c4afcd847d0d5f8864d23c0786935341e3f752
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7592
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <gaumless@gmail.com>

src/lib/cbmem.c

diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index b0e73e2..0b24ad2 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -256,9 +256,7 @@
 #else
 	cbmem_recovery(0);
 #endif
-#if CONFIG_CONSOLE_CBMEM
 	cbmemc_reinit();
-#endif
 }
 
 BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {

src/lib/cbmem_console.c

diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index b5b75f3..997bb7d 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -188,6 +188,11 @@
 {
 	struct cbmem_console *cbm_cons_p = NULL;
 
+#ifdef __PRE_RAM__
+	if (IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE))
+		return;
+#endif
+
 #ifndef __PRE_RAM__
 	cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE);
 #endif

src/lib/dynamic_cbmem.c

diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c
index 3dc5077..5eddbca 100644
--- a/src/lib/dynamic_cbmem.c
+++ b/src/lib/dynamic_cbmem.c
@@ -426,9 +426,7 @@
 static void init_cbmem_pre_device(void *unused)
 {
 	cbmem_initialize();
-#if CONFIG_CONSOLE_CBMEM
 	cbmemc_reinit();
-#endif /* CONFIG_CONSOLE_CBMEM */
 }
 
 BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {