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 <reinauer@google.com>

BUG=chrome-os-partner:18637
TEST=none
BRANCH=none

Change-Id: I3979be4b1d67de27275bc7ba4f45131b09a276f0
Reviewed-on: https://gerrit.chromium.org/gerrit/59323
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Commit-Queue: David Hendricks <dhendrix@chromium.org>

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
 }

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[] =