From b1e4a9a6c3dba30c883061cf0252c05e38f9d5c2 Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Thu, 30 Sep 2021 14:05:34 +0200 Subject: mb/siemens/mc_ehl: Move UART_FOR_CONSOLE switch to variant level There are currently two variants for mc_ehl where different UARTs are used for the console. Move the Kconfig switch UART_FOR_CONSOLE to the Kconfig of the variant and select the matching value there. Change-Id: I7152013a0e32ff151b92932a47953705e591dc0d Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/c/coreboot/+/58052 Reviewed-by: Mario Scheithauer Tested-by: build bot (Jenkins) --- src/mainboard/siemens/mc_ehl/Kconfig | 5 ----- src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig | 4 ++++ src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mainboard/siemens/mc_ehl/Kconfig b/src/mainboard/siemens/mc_ehl/Kconfig index 8e5d95f490..90881aac4f 100644 --- a/src/mainboard/siemens/mc_ehl/Kconfig +++ b/src/mainboard/siemens/mc_ehl/Kconfig @@ -34,9 +34,4 @@ config DEVICETREE config DIMM_SPD_SIZE default 512 -config UART_FOR_CONSOLE - int - default 2 if INTEL_LPSS_UART_FOR_CONSOLE - default 0 - endif # BOARD_SIEMENS_BASEBOARD_MC_EHL diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig index bc799ddad9..fbee7b0ede 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig @@ -8,4 +8,8 @@ config BOARD_SPECIFIC_OPTIONS config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" +config UART_FOR_CONSOLE + int + default 2 + endif # BOARD_SIEMENS_MC_EHL1 diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig index 645379f907..f577b243e9 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig @@ -8,4 +8,8 @@ config BOARD_SPECIFIC_OPTIONS config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" +config UART_FOR_CONSOLE + int + default 0 + endif # BOARD_SIEMENS_MC_EHL2 -- cgit v1.2.3