diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-28 10:13:03 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-12-16 20:41:02 +0100 |
| commit | 71b214553c952e790219864767ba7882c9aaae1f (patch) | |
| tree | f9168f6214f9ab33afc28d116dddf07c68717c58 /src/lib | |
| parent | 13a845acb3aee15dad1b4d66027731baba659e0e (diff) | |
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')
| -rw-r--r-- | src/lib/cbmem.c | 2 | ||||
| -rw-r--r-- | src/lib/cbmem_console.c | 5 | ||||
| -rw-r--r-- | src/lib/dynamic_cbmem.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index b0e73e2f31..0b24ad2af9 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -256,9 +256,7 @@ static void init_cbmem_post_device(void *unused) #else cbmem_recovery(0); #endif -#if CONFIG_CONSOLE_CBMEM cbmemc_reinit(); -#endif } BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = { diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index b5b75f3ee6..997bb7d9b2 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 diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c index 3dc50770a7..5eddbcaf18 100644 --- a/src/lib/dynamic_cbmem.c +++ b/src/lib/dynamic_cbmem.c @@ -426,9 +426,7 @@ void *cbmem_entry_start(const struct cbmem_entry *entry) 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) = { |