Simplify early / bootblock console code
Change-Id: I6b28bb95c7decbe3eed33b5b5a029bee48bbe403
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3691
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/src/console/Kconfig b/src/console/Kconfig
index f62cfdd..013b72f 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -1,22 +1,15 @@
menu "Console"
-config DEFAULT_BOOTBLOCK_CONSOLE
- bool
- default n
-
config BOOTBLOCK_CONSOLE
bool "Enable early (bootblock) console output."
- default DEFAULT_BOOTBLOCK_CONSOLE
+ depends on ARCH_ARMV7
+ default n
help
Use console during the bootblock if supported
-config DEFAULT_EARLY_CONSOLE
- bool
- default n
-
config EARLY_CONSOLE
bool "Enable early (pre-RAM) console output."
- default DEFAULT_EARLY_CONSOLE
+ default n
help
Use console during early (pre-RAM) boot stages
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 788e219..9d268e4 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -20,7 +20,7 @@
config CACHE_AS_RAM
bool
- select DEFAULT_EARLY_CONSOLE
+ select EARLY_CONSOLE
default !ROMCC
config DCACHE_RAM_BASE
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig
index d6c3f1e..63b46d6 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/cpu/samsung/exynos5250/Kconfig
@@ -2,8 +2,7 @@
depends on ARCH_ARMV7
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
- select DEFAULT_BOOTBLOCK_CONSOLE
- select DEFAULT_EARLY_CONSOLE
+ select EARLY_CONSOLE
bool
default n
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig
index efa0b21..63ff08c 100644
--- a/src/cpu/samsung/exynos5420/Kconfig
+++ b/src/cpu/samsung/exynos5420/Kconfig
@@ -2,7 +2,7 @@
depends on ARCH_ARMV7
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
- select DEFAULT_EARLY_CONSOLE
+ select EARLY_CONSOLE
bool
default n
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 944e711..9bee946 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -26,7 +26,6 @@
select ARCH_ARMV7
select CPU_ARMLTD_CORTEX_A9
select HAVE_UART_MEMORY_MAPPED
- select DEFAULT_EARLY_CONSOLE
select HAVE_UART_SPECIAL
select BOARD_ROMSIZE_KB_4096