Patch set updated for coreboot: 1b009f6 CBMEM CONSOLE: Add code using the new console driver.

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/721

-gerrit

commit 1b009f69c858be9f41a76defa53672fe40f24c0f
Author: Vadim Bendebury 
Date:   Fri Sep 30 11:16:49 2011 -0700

CBMEM CONSOLE: Add code using the new console driver.

The new added code is compiled in when the CBMEM_CONSOLE config
    flag is enabled.

Change-Id: Ifd1f492ce6321412a014333babbc5b3f14635988
    Signed-off-by: Vadim Bendebury 
---
 src/arch/x86/lib/romcc_console.c    |    3 +++
 src/arch/x86/lib/romstage_console.c |    3 +++
 src/boot/hardwaremain.c             |    3 +++
 src/console/console.c               |    5 ++++-
 4 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index 13ee1f0..0e1f4e6 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -46,6 +46,9 @@ static void __console_tx_byte(unsigned char byte)
 #if CONFIG_CONSOLE_NE2K
    ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
 #endif
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_tx_byte(byte);
+#endif
 }

static void __console_tx_nibble(unsigned nibble)
diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c
index 8adb3ba..0f22727 100644
--- a/src/arch/x86/lib/romstage_console.c
+++ b/src/arch/x86/lib/romstage_console.c
@@ -46,6 +46,9 @@ static void console_tx_byte(unsigned char byte)
 #if CONFIG_CONSOLE_NE2K
    ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT);
 #endif
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_tx_byte(byte);
+#endif
 }

static void console_tx_flush(void)
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 3d15b55..9b293c0 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -92,6 +92,9 @@ void hardwaremain(int boot_complete)

#if CONFIG_WRITE_HIGH_TABLES == 1
    cbmem_initialize();
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_reinit();
+#endif
 #endif
 #if CONFIG_HAVE_ACPI_RESUME == 1
    suspend_resume();
diff --git a/src/console/console.c b/src/console/console.c
index d933668..8f60f04 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -87,7 +87,7 @@ int console_tst_byte(void)
    return 0;
 }

-#else
+#else // __PRE_RAM__   ^^^ NOT defined   vvv defined

void console_init(void)
 {
@@ -104,6 +104,9 @@ void console_init(void)
 #if CONFIG_CONSOLE_NE2K
    ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
 #endif
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_init();
+#endif
    static const char console_test[] =
    	"\n\ncoreboot-"
    	COREBOOT_VERSION