diff --git a/src/console/Kconfig b/src/console/Kconfig index f62cfdd1b1..013b72feca 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 788e2190bc..9d268e45b5 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -20,7 +20,7 @@ source src/cpu/x86/Kconfig 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 d6c3f1eae4..63b46d64ed 100644 --- a/src/cpu/samsung/exynos5250/Kconfig +++ b/src/cpu/samsung/exynos5250/Kconfig @@ -2,8 +2,7 @@ config CPU_SAMSUNG_EXYNOS5250 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 efa0b214d9..63ff08c1f0 100644 --- a/src/cpu/samsung/exynos5420/Kconfig +++ b/src/cpu/samsung/exynos5420/Kconfig @@ -2,7 +2,7 @@ config CPU_SAMSUNG_EXYNOS5420 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 944e711c25..9bee946730 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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