diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2013-06-19 13:42:00 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-07-10 22:43:56 +0200 |
| commit | d2f45c651694b2ada2443bb12def23e6c7910b10 (patch) | |
| tree | fb728d20d9852393de6f2f457b6fe51203262769 | |
| parent | b919809afeaf3c571961ead626c04b8f9e258e11 (diff) | |
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>
| -rw-r--r-- | src/console/Kconfig | 13 | ||||
| -rw-r--r-- | src/cpu/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/Kconfig | 3 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5420/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-armv7/Kconfig | 1 |
5 files changed, 6 insertions, 15 deletions
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 |