summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2018-11-11 00:27:41 +0100
committerNico Huber <nico.h@gmx.de>2018-11-20 17:48:30 +0000
commit3eb720c36e55948c60e158129721705628a9c249 (patch)
tree3b0422d67aa952a3151a7a0f8f153c50e80e0005
parent87ca3898f90a24c92e8dffb70d617049b05d190c (diff)
downloadcoreboot-3eb720c36e55948c60e158129721705628a9c249.tar.xz
drivers/uart/Kconfig: Be smarter about DRIVERS_UART_8250IO
It defaults to y to avoid having to select it per mainboard. But that makes a mess because it results in linker conflicts unless other UART drivers disable it explicitly. We try to be smarter about the default value for now. The real solu- tion would be to hardcode it per mainboard. But who knows which boards actually have it? Change-Id: I7e755fe0e4f6d1c31ef2854603a5510c3cdc4967 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/29571 Reviewed-by: Julius Werner <jwerner@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/drivers/uart/Kconfig3
-rw-r--r--src/soc/intel/denverton_ns/Kconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig
index 39d20a3c2e..1130aeb126 100644
--- a/src/drivers/uart/Kconfig
+++ b/src/drivers/uart/Kconfig
@@ -4,8 +4,11 @@ config DRIVERS_UART
default n
config DRIVERS_UART_8250IO
+ # FIXME: Shouldn't have a prompt, should default to n, and
+ # should be selected by boards that have it instead.
bool "Serial port on SuperIO"
depends on ARCH_X86
+ default n if DRIVERS_UART_8250MEM || HAVE_UART_SPECIAL
default n if NO_UART_ON_SUPERIO
default y
diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig
index d4ae8054a0..5b704b9a5c 100644
--- a/src/soc/intel/denverton_ns/Kconfig
+++ b/src/soc/intel/denverton_ns/Kconfig
@@ -162,7 +162,7 @@ config LEGACY_UART_MODE
endchoice
config ENABLE_HSUART
- depends on (!DRIVERS_UART_8250IO && NON_LEGACY_UART_MODE)
+ depends on NON_LEGACY_UART_MODE
bool "Enable High-speed UART debug port selected by UART_FOR_CONSOLE."
default n
select CONSOLE_SERIAL