diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/init/romstage.ld | 2 | ||||
| -rw-r--r-- | src/lib/cbmem_console.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/init/romstage.ld index 27e8de1c5c..ae7049b423 100644 --- a/src/arch/x86/init/romstage.ld +++ b/src/arch/x86/init/romstage.ld @@ -65,7 +65,7 @@ SECTIONS * statically checked because the cache-as-ram region usage is * cpu/chipset dependent. */ _preram_cbmem_console = .; - _epreram_cbmem_console = . + 0xc00; + _epreram_cbmem_console = . + (CONFIG_LATE_CBMEM_INIT ? 0 : 0xc00); } /* Global variables are not allowed in romstage diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 30bf439511..e9607f3a35 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -225,11 +225,8 @@ void cbmemc_reinit(void) /* Need to reset the newly added cbmem console in ramstage * when there was no console in preram environment. */ - if (ENV_RAMSTAGE) { - cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE); - if (cbm_cons_p == NULL) - flags |= CBMEMC_RESET; - } + if (ENV_RAMSTAGE && IS_ENABLED(CONFIG_LATE_CBMEM_INIT)) + flags |= CBMEMC_RESET; /* If CBMEM entry already existed, old contents is not altered. */ cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE, size); |