summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-04-20 15:24:19 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-04-23 16:35:51 +0200
commitd70bf7cc219f8478e8336f60542a50c078bf531b (patch)
treec2b63025bdf691e3724b7225d58bebd13aa07aca
parent58decc540dd40c180542d214f74773c7c17b4f28 (diff)
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>
-rw-r--r--src/console/Kconfig5
-rw-r--r--src/cpu/amd/model_10xxx/Kconfig5
-rw-r--r--src/include/console/cbmem_console.h4
-rw-r--r--src/lib/cbmem_console.c34
4 files changed, 24 insertions, 24 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 09cfb39f80..28070393db 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -184,11 +184,6 @@ config CONSOLE_CBMEM_BUFFER_SIZE
value (128K or 0x20000 bytes) is large enough to accommodate
even the BIOS_SPEW level.
-config CONSOLE_PRERAM_BUFFER_BASE
- hex
- default 0xabadbeef if !CACHE_AS_RAM || LATE_CBMEM_INIT
- default 0x0
-
endif
config CONSOLE_QEMU_DEBUGCON
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index a0d5cb4c2c..cd69caecf3 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/model_10xxx/Kconfig
@@ -72,9 +72,4 @@ config UDELAY_LAPIC_FIXED_FSB
int
default 200
-config CONSOLE_PRERAM_BUFFER_SIZE
- hex
- default 0x0 if CONSOLE_PRERAM_BUFFER_BASE = 0xabadbeef
- default 0x8000
-
endif # CPU_AMD_MODEL_10XXX
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h
index 81bc10fe64..343145952c 100644
--- a/src/include/console/cbmem_console.h
+++ b/src/include/console/cbmem_console.h
@@ -32,8 +32,8 @@ static inline void cbmemc_reinit(void) {}
#endif
#define __CBMEM_CONSOLE_ENABLE__ CONFIG_CONSOLE_CBMEM && \
- (ENV_RAMSTAGE || (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE && \
- ((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || ENV_ROMSTAGE)))
+ (ENV_RAMSTAGE || (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && \
+ (ENV_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE))))
#if __CBMEM_CONSOLE_ENABLE__
static inline void __cbmemc_init(void) { cbmemc_init(); }
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 770c1d2c9b..628d3b9c1f 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -83,7 +83,7 @@ static inline void init_console_ptr(void *storage, u32 total_space, int flags)
{
struct cbmem_console *cbm_cons_p = storage;
- if (!cbm_cons_p) {
+ if (!cbm_cons_p || total_space == 0) {
current_console_set(NULL);
return;
}
@@ -209,22 +209,32 @@ static void copy_console_buffer(struct cbmem_console *old_cons_p,
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;
- if (ENV_ROMSTAGE && (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE == 0))
- return;
-
- /* If CBMEM entry already existed, old contents is not altered. */
- cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE,
- CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
+ /* No appending when no preram console available and adding for
+ * the first time. */
+ if (!ENV_RAMSTAGE && _preram_cbmem_console_size == 0)
+ flags = CBMEMC_RESET;
- /* Clear old contents of CBMEM buffer. */
- if (ENV_ROMSTAGE || (CONFIG_CONSOLE_PRERAM_BUFFER_SIZE == 0))
+ /* Need to reset the newly added cbmem console in romstage. */
+ if (ENV_ROMSTAGE)
flags |= CBMEMC_RESET;
- init_console_ptr(cbm_cons_p,
- CONFIG_CONSOLE_CBMEM_BUFFER_SIZE, flags);
+ /* 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 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. */
CAR_MIGRATE(cbmemc_reinit)