diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
index 8f4366b90d..77bd800bfe 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -16,6 +16,20 @@ config BOARD_GIGABYTE_GA_H61M_SERIES
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
 
+config BOARD_GIGABYTE_GA_H61M_S2PV
+	select BOARD_GIGABYTE_GA_H61M_SERIES
+
+config BOARD_GIGABYTE_GA_H61M_DS2
+	select BOARD_GIGABYTE_GA_H61M_SERIES
+
+config BOARD_GIGABYTE_GA_H61M_DS2V
+	select BOARD_GIGABYTE_GA_H61M_SERIES
+	select NO_UART_ON_SUPERIO
+
+config BOARD_GIGABYTE_GA_H61MA_D3V
+	select BOARD_GIGABYTE_GA_H61M_SERIES
+	select NO_UART_ON_SUPERIO
+
 if BOARD_GIGABYTE_GA_H61M_SERIES
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig.name b/src/mainboard/gigabyte/ga-h61m-series/Kconfig.name
index f584a28cc2..f70b8242ab 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig.name
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig.name
@@ -1,17 +1,11 @@
 config BOARD_GIGABYTE_GA_H61M_S2PV
 	bool "GA-H61M-S2PV"
-	select BOARD_GIGABYTE_GA_H61M_SERIES
 
 config BOARD_GIGABYTE_GA_H61M_DS2
 	bool "GA-H61M-DS2"
-	select BOARD_GIGABYTE_GA_H61M_SERIES
 
 config BOARD_GIGABYTE_GA_H61M_DS2V
 	bool "GA-H61M-DS2V"
-	select BOARD_GIGABYTE_GA_H61M_SERIES
-	select NO_UART_ON_SUPERIO
 
 config BOARD_GIGABYTE_GA_H61MA_D3V
 	bool "GA-H61MA-D3V"
-	select BOARD_GIGABYTE_GA_H61M_SERIES
-	select NO_UART_ON_SUPERIO