summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2011-09-30 11:16:49 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-03-29 20:14:52 +0200
commit1078c67af1228a556b1c5c182e8616271f6b7919 (patch)
tree87328c0148d61f758e1818ba0fee74e3df180488 /src/console
parentbe25a4ded0957a0ca31f94d32857f1cb03aa42ff (diff)
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 <vbendeb@chromium.org> Reviewed-on: http://review.coreboot.org/721 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/console')
-rw-r--r--src/console/console.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/console/console.c b/src/console/console.c
index d93366852a..8f60f04d4c 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