summaryrefslogtreecommitdiff
path: root/src/console/console.c
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-06-19 15:44:36 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-07-10 22:44:42 +0200
commit9d9b0dd20980c5e9b2cafb07c03775bbaa249ea2 (patch)
treeb729cf0f322eed47e98e42dff8e0d2a098e1a8c9 /src/console/console.c
parent005151047ed5ab875905a5b3ee3942d09039b945 (diff)
downloadcoreboot-9d9b0dd20980c5e9b2cafb07c03775bbaa249ea2.tar.xz
Don't try to use CBMEM console in bootblock
Otherwise we have to worry about hand off between bootblock and romstage. Too much complexity Change-Id: I89bf8a229dba7e1330accadf9a732d831ebc4827 Signed-off-by: Stefan Reinauer <reinauer@chromium.org> Signed-off-by: Gabe Black <gabeblack@chromium.org> Reviewed-on: http://review.coreboot.org/3694 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/console/console.c')
-rw-r--r--src/console/console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/console/console.c b/src/console/console.c
index c53adc6a1e..a0e8f6dbf9 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -117,7 +117,7 @@ void console_init(void)
#if CONFIG_CONSOLE_NE2K
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
#endif
-#if CONFIG_CONSOLE_CBMEM
+#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__)
cbmemc_init();
#endif
#if CONFIG_SPKMODEM