summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-11 21:14:59 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-15 13:15:18 +0200
commit2644793ef486881f3af36bec69d5f9abf82123ac (patch)
treefd930a1bc030dac277f127e564612f576a0fcf44 /src/console
parent082c19ea89a24216aafd4ef728f9983b93f6b486 (diff)
downloadcoreboot-2644793ef486881f3af36bec69d5f9abf82123ac.tar.xz
Have option of timestamps, CBMEM console and usbdebug for most boards
As boards without EARLY_CBMEM_INIT do not initialize CBMEM in romstage, and have no CAR migration, these features are available for ramstage only. Change-Id: Ic3f77ccdedd4e71ba693619c02c9b98b328a0882 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/3970 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/console')
-rw-r--r--src/console/Kconfig1
-rw-r--r--src/console/console.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 9bfb6e9446..f415d93c39 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -274,7 +274,6 @@ config CONSOLE_NE2K_IO_PORT
boundary, qemu needs broader align)
config CONSOLE_CBMEM
- depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM)
bool "Send console output to a CBMEM buffer"
default n
help
diff --git a/src/console/console.c b/src/console/console.c
index 06a460428b..014a4f73c3 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -113,13 +113,13 @@ void console_init(void)
#if CONFIG_CONSOLE_NE2K
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
#endif
-#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__)
+#if CONFIG_CONSOLE_CBMEM && CONFIG_EARLY_CBMEM_INIT && !defined(__BOOT_BLOCK__)
cbmemc_init();
#endif
#if CONFIG_SPKMODEM
spkmodem_init();
#endif
-#if CONFIG_USBDEBUG && !defined(__BOOT_BLOCK__)
+#if CONFIG_USBDEBUG && CONFIG_EARLY_CBMEM_INIT && !defined(__BOOT_BLOCK__)
usbdebug_init();
#endif