From 9d9b0dd20980c5e9b2cafb07c03775bbaa249ea2 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <reinauer@chromium.org>
Date: Wed, 19 Jun 2013 15:44:36 -0700
Subject: 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>
---
 src/console/console.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/console/console.c')

diff --git a/src/console/console.c b/src/console/console.c
index c53adc6a1ed2..a0e8f6dbf920 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
-- 
cgit v1.2.3