diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2013-06-19 15:44:36 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-07-10 22:44:42 +0200 |
| commit | 9d9b0dd20980c5e9b2cafb07c03775bbaa249ea2 (patch) | |
| tree | b729cf0f322eed47e98e42dff8e0d2a098e1a8c9 | |
| parent | 005151047ed5ab875905a5b3ee3942d09039b945 (diff) | |
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>
| -rw-r--r-- | src/arch/armv7/early_console.c | 2 | ||||
| -rw-r--r-- | 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 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 |