[coreboot-gerrit] Patch set updated for coreboot: be7a446 Don't try to use CBMEM console in bootblock

[Gabe Black (gabeblack@chromium.org)]

Gabe Black (gabeblack at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3694

-gerrit

commit be7a446507e3fe0bfb3a261351019e1cfebf806d
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Wed Jun 19 15:44:36 2013 -0700

    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 at chromium.org>
    Signed-off-by: Gabe Black <gabeblack at chromium.org>
---
 src/arch/armv7/early_console.c | 2 +-
 src/console/console.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c
index 68e81c6..84f97ba 100644
--- a/src/arch/armv7/early_console.c
+++ b/src/arch/armv7/early_console.c
@@ -41,7 +41,7 @@ void console_tx_byte(unsigned char byte)
 #if CONFIG_USBDEBUG
 	usbdebug_tx_byte(0, byte);
 #endif
-#if CONFIG_CONSOLE_CBMEM
+#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__)
 	cbmemc_tx_byte(byte);
 #endif
 }
diff --git a/src/console/console.c b/src/console/console.c
index c53adc6..a0e8f6d 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