diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index 862c0b4b20..d3a06134c7 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -16,6 +16,18 @@ config BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 	select DRIVERS_UART_8250IO
 	select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
 
+config BOARD_SUPERMICRO_X11SSH_TF
+	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
+
+config BOARD_SUPERMICRO_X11SSM_F
+	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
+
+config BOARD_SUPERMICRO_X11SSH_F
+	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
+
+config BOARD_SUPERMICRO_X11SSW_F
+	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
+
 if BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 
 config DISABLE_HECI1_AT_PRE_BOOT
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name b/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name
index cdefa73f12..f72fa97faa 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name
@@ -1,15 +1,11 @@
 config BOARD_SUPERMICRO_X11SSH_TF
 	bool "X11SSH-TF"
-	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 
 config BOARD_SUPERMICRO_X11SSM_F
 	bool "X11SSM-F"
-	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 
 config BOARD_SUPERMICRO_X11SSH_F
 	bool "X11SSH-F/LN4F"
-	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 
 config BOARD_SUPERMICRO_X11SSW_F
 	bool "X11SSW-F"
-	select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES