From 1139ba7c6c348dcd0113b1ba54b24a434d3b73d2 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 19 Jun 2013 15:44:36 -0700 Subject: [PATCH] Don't try to use CBMEM console in bootblock Otherwise we have to worry about hand off between bootblock and romstage. Too much complexity Signed-off-by: Stefan Reinauer BUG=chrome-os-partner:18637 TEST=none BRANCH=none Change-Id: I3979be4b1d67de27275bc7ba4f45131b09a276f0 Reviewed-on: https://gerrit.chromium.org/gerrit/59323 Reviewed-by: Stefan Reinauer Tested-by: Stefan Reinauer Commit-Queue: David Hendricks --- 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 68e81c632e..84f97ba749 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 64056b43ea..7aee527abb 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 static const char console_test[] =