[coreboot-gerrit] Patch set updated for coreboot: 1c47d6e CBMEM console: Support late init
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Fri Sep 13 09:35:59 CEST 2013
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3915
-gerrit
commit 1c47d6e03d1f1ba4a72a773feff82af38e09a913
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Mon Sep 9 01:31:22 2013 +0300
CBMEM console: Support late init
It is not compulsory to have CBMEM console initialised in romstage,
so try add the CBMEM table entry again in ramstage, if not found.
Change-Id: I96ab502df7f05d6bf1d6e6fa84d395ef6306b525
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/lib/cbmem_console.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 1b58402..819c27f 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -195,27 +195,27 @@ static void copy_console_buffer(struct cbmem_console *new_cons_p)
static void cbmemc_reinit_(void)
{
- struct cbmem_console *cbm_cons_p;
+ struct cbmem_console *cbm_cons_p = NULL;
+
+#ifndef __PRE_RAM__
+ cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE);
+#endif
-#ifdef __PRE_RAM__
- cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE,
- CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
if (!cbm_cons_p) {
- current_console_set(NULL);
- return;
- }
+ cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE,
+ CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
- cbm_cons_p->buffer_size = CONFIG_CONSOLE_CBMEM_BUFFER_SIZE -
- sizeof(struct cbmem_console);
+ if (!cbm_cons_p) {
+ current_console_set(NULL);
+ return;
+ }
- cbm_cons_p->buffer_cursor = 0;
-#else
- cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE);
+ cbm_cons_p->buffer_size = CONFIG_CONSOLE_CBMEM_BUFFER_SIZE -
+ sizeof(struct cbmem_console);
- if (!cbm_cons_p)
- return;
+ cbm_cons_p->buffer_cursor = 0;
+ }
-#endif
copy_console_buffer(cbm_cons_p);
current_console_set(cbm_cons_p);
More information about the coreboot-gerrit
mailing list