Change in ...coreboot[master]: siemens/mc_apl1: Switch INTEL_LPSS_UART_FOR_CONSOLE to variants
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
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl1: Switch INTEL_LPSS_UART_FOR_CONSOLE to variants ......................................................................
Patch Set 1:
(1 comment)
In theory, all you'd need is adding the UART_FOR_CONSOLE default for mc_apl4. Everything else could be kept in the base-level Kconfig.
https://review.coreboot.org/#/c/30933/1/src/mainboard/siemens/mc_apl1/Kconfi... File src/mainboard/siemens/mc_apl1/Kconfig:
https://review.coreboot.org/#/c/30933/1/src/mainboard/siemens/mc_apl1/Kconfi... PS1, Line 7: If all variants use it, you could have left it here.
Hello Werner Zeh, Uwe Poeche, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/30933
to look at the new patch set (#2).
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
siemens/mc_apl4: Change UART_FOR_CONSOLE index
This mainboard uses SOC internal UART 1 instead of UART 2 like all other mc_apl1 mainboards.
Change-Id: Ib986962ed068fee019ffcec0391d43d5ab178458 Signed-off-by: Mario Scheithauer mario.scheithauer@siemens.com --- M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig 1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/30933/2
Mario Scheithauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
Patch Set 2:
Patch Set 1:
(1 comment)
In theory, all you'd need is adding the UART_FOR_CONSOLE default for mc_apl4. Everything else could be kept in the base-level Kconfig.
Hi Nico, Thanks for the hint. I've corrected it.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
Patch Set 2: Code-Review+2
Well, I said "in theory" ;) did you test it?
Mario Scheithauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
Patch Set 2:
Patch Set 2: Code-Review+2
Well, I said "in theory" ;) did you test it?
Yes, I've checked the .config file for mc_apl4 and there's an 1 set for CONFIG_UART_FOR_CONSOLE. So that's how it's gonna work.
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
Patch Set 2: Code-Review+2
Patch Set 2:
Patch Set 2: Code-Review+2
Well, I said "in theory" ;) did you test it?
Yes, I've checked the .config file for mc_apl4 and there's an 1 set for CONFIG_UART_FOR_CONSOLE. So that's how it's gonna work.
Yes, it wokrs because the Kconfig files of the variants are sourced first and if a Kconfig symbol has been declared there, it cannot be re-declared here again. Just in the case where this symbol is missing in the variants Kconfig the one in the "top-level" Kconfig will be used. So that should pretty well serve our demand here.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
Patch Set 2: Code-Review+2
Werner Zeh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30933 )
Change subject: siemens/mc_apl4: Change UART_FOR_CONSOLE index ......................................................................
siemens/mc_apl4: Change UART_FOR_CONSOLE index
This mainboard uses SOC internal UART 1 instead of UART 2 like all other mc_apl1 mainboards.
Change-Id: Ib986962ed068fee019ffcec0391d43d5ab178458 Signed-off-by: Mario Scheithauer mario.scheithauer@siemens.com Reviewed-on: https://review.coreboot.org/c/30933 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Werner Zeh werner.zeh@siemens.com Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig 1 file changed, 3 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Werner Zeh: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig index bc7922f..247b052 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -7,4 +7,7 @@ select APL_SET_MIN_CLOCK_RATIO select DRIVERS_I2C_RX6110SA
+config UART_FOR_CONSOLE + default 1 + endif # BOARD_SIEMENS_MC_APL4
-
Angel Pons (Code Review) -
Mario Scheithauer (Code Review)
-
Nico Huber (Code Review)
-
Werner Zeh (Code Review)