aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/cbmem_console.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-11-28 10:13:03 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-16 20:41:02 +0100
commit71b214553c952e790219864767ba7882c9aaae1f (patch)
treef9168f6214f9ab33afc28d116dddf07c68717c58 /src/lib/cbmem_console.c
parent13a845acb3aee15dad1b4d66027731baba659e0e (diff)
downloadcoreboot-71b214553c952e790219864767ba7882c9aaae1f.tar.gz
coreboot-71b214553c952e790219864767ba7882c9aaae1f.tar.xz
coreboot-71b214553c952e790219864767ba7882c9aaae1f.zip
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>
Diffstat (limited to 'src/lib/cbmem_console.c')
-rw-r--r--src/lib/cbmem_console.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index b5b75f3ee..997bb7d9b 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -188,6 +188,11 @@ void cbmemc_reinit(void)
{
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