diff --git a/src/mainboard/siemens/fa_ehl/Kconfig b/src/mainboard/siemens/fa_ehl/Kconfig
index c673f9bc24..a2f8c89c16 100644
--- a/src/mainboard/siemens/fa_ehl/Kconfig
+++ b/src/mainboard/siemens/fa_ehl/Kconfig
@@ -7,6 +7,9 @@ config BOARD_SIEMENS_BASEBOARD_FA_EHL
 	select USE_SIEMENS_HWILIB
 	select SOC_INTEL_DISABLE_POWER_LIMITS
 
+config BOARD_SIEMENS_FA_EHL
+	select BOARD_SIEMENS_BASEBOARD_FA_EHL
+
 source "src/mainboard/siemens/fa_ehl/variants/*/Kconfig"
 
 if BOARD_SIEMENS_BASEBOARD_FA_EHL
diff --git a/src/mainboard/siemens/fa_ehl/Kconfig.name b/src/mainboard/siemens/fa_ehl/Kconfig.name
index 0f9d062920..b3bbe8afe1 100644
--- a/src/mainboard/siemens/fa_ehl/Kconfig.name
+++ b/src/mainboard/siemens/fa_ehl/Kconfig.name
@@ -2,4 +2,3 @@ comment "FA EHL"
 
 config BOARD_SIEMENS_FA_EHL
 	bool "-> FA EHL"
-	select BOARD_SIEMENS_BASEBOARD_FA_EHL
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
index 47017393d3..73efead087 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -7,6 +7,27 @@ config BOARD_SIEMENS_BASEBOARD_MC_APL1
 	select USE_SIEMENS_HWILIB
 	select INTEL_LPSS_UART_FOR_CONSOLE
 
+config BOARD_SIEMENS_MC_APL1
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
+config BOARD_SIEMENS_MC_APL2
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
+config BOARD_SIEMENS_MC_APL3
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
+config BOARD_SIEMENS_MC_APL4
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
+config BOARD_SIEMENS_MC_APL5
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
+config BOARD_SIEMENS_MC_APL6
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
+config BOARD_SIEMENS_MC_APL7
+	select BOARD_SIEMENS_BASEBOARD_MC_APL1
+
 source "src/mainboard/siemens/mc_apl1/variants/*/Kconfig"
 
 if BOARD_SIEMENS_BASEBOARD_MC_APL1
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig.name b/src/mainboard/siemens/mc_apl1/Kconfig.name
index 9c9ff27760..4fd32e5042 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig.name
+++ b/src/mainboard/siemens/mc_apl1/Kconfig.name
@@ -2,28 +2,21 @@ comment "MC APLx"
 
 config BOARD_SIEMENS_MC_APL1
 	bool "-> MC APL1"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config BOARD_SIEMENS_MC_APL2
 	bool "-> MC APL2"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config BOARD_SIEMENS_MC_APL3
 	bool "-> MC APL3"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config BOARD_SIEMENS_MC_APL4
 	bool "-> MC APL4"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config BOARD_SIEMENS_MC_APL5
 	bool "-> MC APL5"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config BOARD_SIEMENS_MC_APL6
 	bool "-> MC APL6"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config BOARD_SIEMENS_MC_APL7
 	bool "-> MC APL7"
-	select BOARD_SIEMENS_BASEBOARD_MC_APL1
diff --git a/src/mainboard/siemens/mc_ehl/Kconfig b/src/mainboard/siemens/mc_ehl/Kconfig
index 89d53c7fa7..93b084d4e1 100644
--- a/src/mainboard/siemens/mc_ehl/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/Kconfig
@@ -9,6 +9,21 @@ config BOARD_SIEMENS_BASEBOARD_MC_EHL
 	select USE_SIEMENS_HWILIB
 	select SOC_INTEL_DISABLE_POWER_LIMITS
 
+config BOARD_SIEMENS_MC_EHL1
+	select BOARD_SIEMENS_BASEBOARD_MC_EHL
+
+config BOARD_SIEMENS_MC_EHL2
+	select BOARD_SIEMENS_BASEBOARD_MC_EHL
+
+config BOARD_SIEMENS_MC_EHL3
+	select BOARD_SIEMENS_BASEBOARD_MC_EHL
+
+config BOARD_SIEMENS_MC_EHL4
+	select BOARD_SIEMENS_BASEBOARD_MC_EHL
+
+config BOARD_SIEMENS_MC_EHL5
+	select BOARD_SIEMENS_BASEBOARD_MC_EHL
+
 source "src/mainboard/siemens/mc_ehl/variants/*/Kconfig"
 
 if BOARD_SIEMENS_BASEBOARD_MC_EHL
diff --git a/src/mainboard/siemens/mc_ehl/Kconfig.name b/src/mainboard/siemens/mc_ehl/Kconfig.name
index 8ad4744e55..7f22703aec 100644
--- a/src/mainboard/siemens/mc_ehl/Kconfig.name
+++ b/src/mainboard/siemens/mc_ehl/Kconfig.name
@@ -2,20 +2,15 @@ comment "MC EHLx"
 
 config BOARD_SIEMENS_MC_EHL1
 	bool "-> MC EHL1"
-	select BOARD_SIEMENS_BASEBOARD_MC_EHL
 
 config BOARD_SIEMENS_MC_EHL2
 	bool "-> MC EHL2"
-	select BOARD_SIEMENS_BASEBOARD_MC_EHL
 
 config BOARD_SIEMENS_MC_EHL3
 	bool "-> MC EHL3"
-	select BOARD_SIEMENS_BASEBOARD_MC_EHL
 
 config BOARD_SIEMENS_MC_EHL4
 	bool "-> MC EHL4"
-	select BOARD_SIEMENS_BASEBOARD_MC_EHL
 
 config BOARD_SIEMENS_MC_EHL5
 	bool "-> MC EHL5"
-	select BOARD_SIEMENS_BASEBOARD_MC_EHL