Mario Scheithauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30933
Change subject: siemens/mc_apl1: Switch INTEL_LPSS_UART_FOR_CONSOLE to variants ......................................................................
siemens/mc_apl1: Switch INTEL_LPSS_UART_FOR_CONSOLE to variants
Since not all mc_apl1 mainboards use the same internal MMIO UART for console output, the selection must be made on the variants Kconfig file.
Change-Id: Ib986962ed068fee019ffcec0391d43d5ab178458 Signed-off-by: Mario Scheithauer mario.scheithauer@siemens.com --- M src/mainboard/siemens/mc_apl1/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig 6 files changed, 20 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/30933/1
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig index 196ca28..7ec843b 100644 --- a/src/mainboard/siemens/mc_apl1/Kconfig +++ b/src/mainboard/siemens/mc_apl1/Kconfig @@ -5,7 +5,6 @@ select BOARD_ROMSIZE_KB_16384 select HAVE_ACPI_TABLES select USE_SIEMENS_HWILIB - select INTEL_LPSS_UART_FOR_CONSOLE
source "src/mainboard/siemens/mc_apl1/variants/*/Kconfig"
@@ -35,9 +34,6 @@ default "MC APL4" if BOARD_SIEMENS_MC_APL4 default "MC APL5" if BOARD_SIEMENS_MC_APL5
-config UART_FOR_CONSOLE - default 2 - config MAX_CPUS int default 8 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig index 76d62fc..345795c 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/Kconfig @@ -8,5 +8,9 @@ select DRIVER_SIEMENS_NC_FPGA select NC_FPGA_NOTIFY_CB_READY select APL_SKIP_SET_POWER_LIMITS + select INTEL_LPSS_UART_FOR_CONSOLE + +config UART_FOR_CONSOLE + default 2
endif # BOARD_SIEMENS_MC_APL1 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig index 393f9c6..0a06d51 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig @@ -6,5 +6,9 @@ select DRIVER_INTEL_I210 select DRIVERS_I2C_RX6110SA select DRIVER_SIEMENS_NC_FPGA + select INTEL_LPSS_UART_FOR_CONSOLE + +config UART_FOR_CONSOLE + default 2
endif # BOARD_SIEMENS_MC_APL2 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig index 32db935..50df55f 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/Kconfig @@ -8,5 +8,9 @@ select DRIVER_SIEMENS_NC_FPGA select NC_FPGA_NOTIFY_CB_READY select APL_SKIP_SET_POWER_LIMITS + select INTEL_LPSS_UART_FOR_CONSOLE + +config UART_FOR_CONSOLE + default 2
endif # BOARD_SIEMENS_MC_APL3 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig index bc7922f..28fd501 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -6,5 +6,9 @@ select DRIVER_INTEL_I210 select APL_SET_MIN_CLOCK_RATIO select DRIVERS_I2C_RX6110SA + select INTEL_LPSS_UART_FOR_CONSOLE + +config UART_FOR_CONSOLE + default 1
endif # BOARD_SIEMENS_MC_APL4 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig index 196176c..e1f7547 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig @@ -8,5 +8,9 @@ select DRIVER_SIEMENS_NC_FPGA select NC_FPGA_NOTIFY_CB_READY select APL_SKIP_SET_POWER_LIMITS + select INTEL_LPSS_UART_FOR_CONSOLE + +config UART_FOR_CONSOLE + default 2
endif # BOARD_SIEMENS_MC_APL5