commit 52a27223892936cdc8e1744516a82a2e44584763
author Kyösti Mälkki <kyosti.malkki@gmail.com> Mon Sep 09 01:31:22 2013 +0300
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Sat Sep 21 06:21:53 2013 +0200
tree 11c2bc4172005515f0a0c9b29b9ab0b4f061dc84
parent f56ff9069eb49df30d7e99e4e67aad851a54bc7d

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@gmail.com>
Reviewed-on: http://review.coreboot.org/3915
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@google.com>

src/lib/cbmem_console.c

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 cbmemc_reinit_(void)
 {
-	struct cbmem_console *cbm_cons_p;
+	struct cbmem_console *cbm_cons_p = NULL;
 
-#ifdef __PRE_RAM__
-	cbm_cons_p = cbmem_add(CBMEM_ID_CONSOLE,
-			       CONFIG_CONSOLE_CBMEM_BUFFER_SIZE);
+#ifndef __PRE_RAM__
+	cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE);
+#endif
+
 	if (!cbm_cons_p) {
-		current_console_set(NULL);
-		return;
+		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->buffer_size = CONFIG_CONSOLE_CBMEM_BUFFER_SIZE -
+			sizeof(struct cbmem_console);
+
+		cbm_cons_p->buffer_cursor = 0;
 	}
 
-	cbm_cons_p->buffer_size = CONFIG_CONSOLE_CBMEM_BUFFER_SIZE -
-		sizeof(struct cbmem_console);
-
-	cbm_cons_p->buffer_cursor = 0;
-#else
-	cbm_cons_p = cbmem_find(CBMEM_ID_CONSOLE);
-
-	if (!cbm_cons_p)
-		return;
-
-#endif
 	copy_console_buffer(cbm_cons_p);
 
 	current_console_set(cbm_cons_p);