X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fconsole%2Fconsole.c;h=8f60f04d4caebcadcb95a5991cf42f94ba28b75a;hb=1078c67af1228a556b1c5c182e8616271f6b7919;hp=325170d0608f783b74982ba328880ad5f107823b;hpb=20fc631ad2c483fd2bc12e56f3ca8a1572688fb5;p=coreboot.git

diff --git a/src/console/console.c b/src/console/console.c
index 325170d06..8f60f04d4 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -22,18 +22,6 @@
 #include <arch/hlt.h>
 #include <arch/io.h>
 
-#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
-#include <uart8250.h>
-#endif
-
-#if CONFIG_CONSOLE_NE2K
-#include <console/ne2k.h>
-#endif
-
-#if CONFIG_USBDEBUG
-#include <usbdebug.h>
-#endif
-
 #ifndef __PRE_RAM__
 #include <string.h>
 #include <pc80/mc146818rtc.h>
@@ -52,21 +40,21 @@ void console_init(void)
 	}
 }
 
-static void __console_tx_byte(unsigned char byte)
+void console_tx_flush(void)
 {
 	struct console_driver *driver;
 	for(driver = console_drivers; driver < econsole_drivers; driver++) {
-		driver->tx_byte(byte);
+		if (!driver->tx_flush)
+			continue;
+		driver->tx_flush();
 	}
 }
 
-void console_tx_flush(void)
+static void __console_tx_byte(unsigned char byte)
 {
 	struct console_driver *driver;
 	for(driver = console_drivers; driver < econsole_drivers; driver++) {
-		if (!driver->tx_flush)
-			continue;
-		driver->tx_flush();
+		driver->tx_byte(byte);
 	}
 }
 
@@ -99,7 +87,7 @@ int console_tst_byte(void)
 	return 0;
 }
 
-#else
+#else // __PRE_RAM__   ^^^ NOT defined   vvv defined
 
 void console_init(void)
 {
@@ -115,6 +103,9 @@ void console_init(void)
 #endif
 #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-"