19 files changed, 40 insertions, 25 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 02cf2519abe3..29d0f71a1899 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -174,6 +174,11 @@ M:	Mike Banon <mikebdp2@gmail.com>
 S:	Maintained
 F:	src/mainboard/asus/am1i-a/
 
+ASUS H61 SERIES MAINBOARDS
+M:	Angel Pons <th3fanbus@gmail.com>
+S:	Maintained
+F:	src/mainboard/asus/h61-series/
+
 ASUS MAXIMUS IV GENE-Z MAINBOARD
 M:	Tristan Corrick <tristan@corrick.kiwi>
 S:	Maintained
@@ -195,11 +200,6 @@ M:	Tristan Corrick <tristan@corrick.kiwi>
 S:	Maintained
 F:	src/mainboard/asus/p8h61-m_lx/
 
-ASUS P8H61-M LX3 R2.0 MAINBOARD
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p8h61-m_lx3_r2_0/
-
 ASUS P8H61-M PRO MAINBOARD
 M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig b/src/mainboard/asus/h61-series/Kconfig
index 16fbbb8af771..2ef66427882b 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -1,29 +1,32 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-if BOARD_ASUS_P8H61_M_LX3_R2_0
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select BOARD_ROMSIZE_KB_8192
+config BOARD_ASUS_H61_SERIES
+	bool
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_LIBGFXINIT
-	select NO_UART_ON_SUPERIO
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
-	select REALTEK_8168_RESET
-	select RT8168_SET_LED_MODE
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
-	select SUPERIO_NUVOTON_NCT6779D
 	select USE_NATIVE_RAMINIT
 
+if BOARD_ASUS_H61_SERIES
+
 config MAINBOARD_DIR
 	string
-	default "asus/p8h61-m_lx3_r2_0"
+	default "asus/h61-series"
+
+config VARIANT_DIR
+	string
+	default "p8h61-m_lx3_r2_0" if BOARD_ASUS_P8H61_M_LX3_R2_0
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "P8H61-M LX3 R2.0"
+	default "P8H61-M LX3 R2.0" if BOARD_ASUS_P8H61_M_LX3_R2_0
+
+config DEVICETREE
+	string
+	default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 endif
diff --git a/src/mainboard/asus/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name
new file mode 100644
index 000000000000..14ca540753de
--- /dev/null
+++ b/src/mainboard/asus/h61-series/Kconfig.name
@@ -0,0 +1,8 @@
+config BOARD_ASUS_P8H61_M_LX3_R2_0
+	bool "P8H61-M LX3 R2.0"
+	select BOARD_ASUS_H61_SERIES
+	select BOARD_ROMSIZE_KB_8192
+	select NO_UART_ON_SUPERIO
+	select REALTEK_8168_RESET
+	select RT8168_SET_LED_MODE
+	select SUPERIO_NUVOTON_NCT6779D
diff --git a/src/mainboard/asus/h61-series/Makefile.inc b/src/mainboard/asus/h61-series/Makefile.inc
new file mode 100644
index 000000000000..e3392856201a
--- /dev/null
+++ b/src/mainboard/asus/h61-series/Makefile.inc
@@ -0,0 +1,8 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+bootblock-y += variants/$(VARIANT_DIR)/early_init.c
+romstage-y  += variants/$(VARIANT_DIR)/early_init.c
+bootblock-y += variants/$(VARIANT_DIR)/gpio.c
+romstage-y  += variants/$(VARIANT_DIR)/gpio.c
+ramstage-y  += variants/$(VARIANT_DIR)/hda_verb.c
+ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/ec.asl b/src/mainboard/asus/h61-series/acpi/ec.asl
index e69de29bb2d1..e69de29bb2d1 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/ec.asl
+++ b/src/mainboard/asus/h61-series/acpi/ec.asl
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/platform.asl b/src/mainboard/asus/h61-series/acpi/platform.asl
index 7da03bfddd02..7da03bfddd02 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/platform.asl
+++ b/src/mainboard/asus/h61-series/acpi/platform.asl
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/superio.asl b/src/mainboard/asus/h61-series/acpi/superio.asl
index ee2eabeb756e..ee2eabeb756e 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/superio.asl
+++ b/src/mainboard/asus/h61-series/acpi/superio.asl
diff --git a/src/mainboard/asus/h61-series/board_info.txt b/src/mainboard/asus/h61-series/board_info.txt
new file mode 100644
index 000000000000..8f74c04efde2
--- /dev/null
+++ b/src/mainboard/asus/h61-series/board_info.txt
@@ -0,0 +1,5 @@
+Category: desktop
+ROM package: DIP-8
+ROM protocol: SPI
+ROM socketed: y
+Flashrom support: y
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl b/src/mainboard/asus/h61-series/dsdt.asl
index e8e2b3a3e560..e8e2b3a3e560 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl
+++ b/src/mainboard/asus/h61-series/dsdt.asl
diff --git a/src/mainboard/asus/h61-series/hda_verb.c b/src/mainboard/asus/h61-series/hda_verb.c
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/src/mainboard/asus/h61-series/hda_verb.c
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/board_info.txt b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/board_info.txt
index 3e3c173aa9cb..3e3c173aa9cb 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/board_info.txt
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/board_info.txt
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/data.vbt b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/data.vbt
index e5be40c56b71..e5be40c56b71 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/data.vbt
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/data.vbt
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb
index 317f9cc22b23..317f9cc22b23 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/early_init.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/early_init.c
index 33efaf6e046a..33efaf6e046a 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/early_init.c
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/early_init.c
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/gma-mainboard.ads b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/gma-mainboard.ads
index 53464cafb4ec..53464cafb4ec 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/gma-mainboard.ads
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/gma-mainboard.ads
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/gpio.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/gpio.c
index 4c326c4272ce..4c326c4272ce 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/gpio.c
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/gpio.c
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c
index 7988e2b4ad6a..7988e2b4ad6a 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/hda_verb.c
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig.name b/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig.name
deleted file mode 100644
index 6d10dcfc391c..000000000000
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_ASUS_P8H61_M_LX3_R2_0
-	bool "P8H61-M LX3 R2.0"
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/Makefile.inc b/src/mainboard/asus/p8h61-m_lx3_r2_0/Makefile.inc
deleted file mode 100644
index 7167e1012304..000000000000
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-bootblock-y += early_init.c
-bootblock-y += gpio.c
-
-romstage-y += early_init.c
-romstage-y += gpio.c
-
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads