GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-11-28 10:13:03 +02:00
parent 13a845acb3
commit 71b214553c
7 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/console/cbmem_console.h
View File

@ -32,7 +32,7 @@ static inline void cbmemc_reinit(void) {}
#endif
#define __CBMEM_CONSOLE_ENABLE__ CONFIG_CONSOLE_CBMEM && \
((ENV_ROMSTAGE && CONFIG_EARLY_CBMEM_INIT) || ENV_RAMSTAGE)
((ENV_ROMSTAGE && !CONFIG_BROKEN_CAR_MIGRATE) || ENV_RAMSTAGE)
#if __CBMEM_CONSOLE_ENABLE__
static inline void __cbmemc_init(void) { cbmemc_init(); }

2
src/lib/cbmem.c
View File

@ -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) = {

5
src/lib/cbmem_console.c
View File

@ -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

2
src/lib/dynamic_cbmem.c
View File

@ -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) = {

4
src/mainboard/intel/cougar_canyon2/romstage.c
View File

@ -342,10 +342,6 @@ void romstage_main_continue(EFI_STATUS status, VOID *HobListPtr) {
timestamp_add(TS_AFTER_INITRAM, after_initram_time);
timestamp_add_now(TS_END_ROMSTAGE);
#endif
#if CONFIG_CONSOLE_CBMEM
/* Keep this the last thing this function does. */
cbmemc_reinit();
#endif
/* Load the ramstage. */
copy_and_run();

4
src/soc/intel/fsp_baytrail/romstage/romstage.c
View File

@ -279,10 +279,6 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) {
timestamp_add_now(TS_END_ROMSTAGE);
#endif
#if IS_ENABLED(CONFIG_CONSOLE_CBMEM)
printk(BIOS_DEBUG, "cbmemc_reinit\n");
cbmemc_reinit();
#endif
post_code(0x4f);
/* Load the ramstage. */

4
src/southbridge/intel/fsp_rangeley/romstage.c
View File

@ -136,10 +136,6 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) {
timestamp_add_now(TS_END_ROMSTAGE);
#endif
#if IS_ENABLED(CONFIG_CONSOLE_CBMEM)
printk(BIOS_DEBUG, "cbmemc_reinit\n");
cbmemc_reinit();
#endif
post_code(0x4f);
/* Load the ramstage. */