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

cbmem_console: fix it for x86 

The Kconfig options pertaining cbmem console in the preram
environment no longer make sense with the linker script
changes. Remove them and their usage within cbmem_console.

Change-Id: Ibf61645ca2331e4851e748e4e7aa5059e1192ed7
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9851
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Aaron Durbin 2015-04-20 15:24:19 -05:00 committed by Patrick Georgi
parent 58decc540d
commit d70bf7cc21
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/console/Kconfig
View File

@ -184,11 +184,6 @@ config CONSOLE_CBMEM_BUFFER_SIZE
value (128K or 0x20000 bytes) is large enough to accommodate value (128K or 0x20000 bytes) is large enough to accommodate
even the BIOS_SPEW level. even the BIOS_SPEW level.
config CONSOLE_PRERAM_BUFFER_BASE
hex
default 0xabadbeef if !CACHE_AS_RAM || LATE_CBMEM_INIT
default 0x0
endif endif
config CONSOLE_QEMU_DEBUGCON config CONSOLE_QEMU_DEBUGCON

5
src/cpu/amd/model_10xxx/Kconfig
View File

@ -72,9 +72,4 @@ config UDELAY_LAPIC_FIXED_FSB
int int
default 200 default 200
config CONSOLE_PRERAM_BUFFER_SIZE
hex
default 0x0 if CONSOLE_PRERAM_BUFFER_BASE = 0xabadbeef
default 0x8000
endif # CPU_AMD_MODEL_10XXX endif # CPU_AMD_MODEL_10XXX

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

@ -32,8 +32,8 @@ static inline void cbmemc_reinit(void) {}
#endif #endif
#define __CBMEM_CONSOLE_ENABLE__ CONFIG_CONSOLE_CBMEM && \ #define __CBMEM_CONSOLE_ENABLE__ CONFIG_CONSOLE_CBMEM && \
(ENV_RAMSTAGE || (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE && \ (ENV_RAMSTAGE || (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && \
((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || ENV_ROMSTAGE))) (ENV_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE))))
#if __CBMEM_CONSOLE_ENABLE__ #if __CBMEM_CONSOLE_ENABLE__
static inline void __cbmemc_init(void) { cbmemc_init(); } static inline void __cbmemc_init(void) { cbmemc_init(); }

34
src/lib/cbmem_console.c
View File

@ -83,7 +83,7 @@ static inline void init_console_ptr(void *storage, u32 total_space, int flags)
{ {
struct cbmem_console *cbm_cons_p = storage; struct cbmem_console *cbm_cons_p = storage;
if (!cbm_cons_p) { if (!cbm_cons_p || total_space == 0) {
current_console_set(NULL); current_console_set(NULL);
return; return;
} }
@ -209,22 +209,32 @@ static void copy_console_buffer(struct cbmem_console *old_cons_p,
void cbmemc_reinit(void) void cbmemc_reinit(void)
{ {
struct cbmem_console *cbm_cons_p = NULL; struct cbmem_console *cbm_cons_p;
const size_t size = CONFIG_CONSOLE_CBMEM_BUFFER_SIZE;
int flags = CBMEMC_APPEND; int flags = CBMEMC_APPEND;
if (ENV_ROMSTAGE && (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE == 0)) /* No appending when no preram console available and adding for
return; * the first time. */
if (!ENV_RAMSTAGE && _preram_cbmem_console_size == 0)
flags = CBMEMC_RESET;
/* If CBMEM entry already existed, old contents is not altered. */ /* Need to reset the newly added cbmem console in romstage. */
cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE, if (ENV_ROMSTAGE)
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
/* Clear old contents of CBMEM buffer. */
if (ENV_ROMSTAGE || (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE == 0))
flags |= CBMEMC_RESET; flags |= CBMEMC_RESET;
init_console_ptr(cbm_cons_p, /* Need to reset the newly added cbmem console in ramstage
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE, flags); * 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 CBMEM entry already existed, old contents is not altered. */
cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE, size);
init_console_ptr(cbm_cons_p, size, flags);
}
/* Call cbmemc_reinit() at CAR migration time. */ /* Call cbmemc_reinit() at CAR migration time. */
CAR_MIGRATE(cbmemc_reinit) CAR_MIGRATE(cbmemc_reinit)