mb/asus/p8z77-m_pro: Transform into variant

To preserve reproducibility, temporarily guard mainboard.c contents.

Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8Z77-M PRO
remains identical when not adding the .config file in it.

Change-Id: I05e272690ca78f6b9e22b1db1c36cb9e5a7afe3c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54411
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

20 files changed, 18 insertions, 88 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f6ee6dd3b4..74f1854489 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -196,13 +196,9 @@ M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
 F:	src/mainboard/asus/p5qpl-am/
 
-ASUS P8Z77-M PRO MAINBOARD
-M:	Vlado Cibic <vladocb@protonmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p8z77-m_pro/
-
 ASUS P8Z77 SERIES MAINBOARDS
 M:	Angel Pons <th3fanbus@gmail.com>
+M:	Vlado Cibic <vladocb@protonmail.com>
 S:	Maintained
 F:	src/mainboard/asus/p8z77-series/
 
diff --git a/src/mainboard/asus/p8z77-m_pro/Kconfig b/src/mainboard/asus/p8z77-m_pro/Kconfig
deleted file mode 100644
index 19a1fe1e5e..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-## SPDX-License-Identifier: GPL-2.0-only
-
-if BOARD_ASUS_P8Z77_M_PRO
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select BOARD_ROMSIZE_KB_8192
-	select HAVE_ACPI_RESUME
-	select HAVE_ACPI_TABLES
-	select INTEL_INT15
-	select NORTHBRIDGE_INTEL_SANDYBRIDGE
-	select SERIRQ_CONTINUOUS_MODE
-	select SOUTHBRIDGE_INTEL_C216
-	select MAINBOARD_HAS_LPC_TPM
-	select MAINBOARD_HAS_TPM1
-	select HAVE_OPTION_TABLE
-	select HAVE_CMOS_DEFAULT
-	select MAINBOARD_HAS_LIBGFXINIT
-	select INTEL_GMA_HAVE_VBT
-	select SUPERIO_NUVOTON_NCT6779D
-	select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
-
-config MAINBOARD_DIR
-	string
-	default "asus/p8z77-m_pro"
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "P8Z77-M PRO"
-
-endif # BOARD_ASUS_P8Z77_M_PRO
diff --git a/src/mainboard/asus/p8z77-m_pro/Kconfig.name b/src/mainboard/asus/p8z77-m_pro/Kconfig.name
deleted file mode 100644
index 372ec4a7da..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/Kconfig.name
+++ /dev/null
@@ -1,4 +0,0 @@
-## SPDX-License-Identifier: GPL-2.0-only
-
-config BOARD_ASUS_P8Z77_M_PRO
-	bool "P8Z77-M PRO"
diff --git a/src/mainboard/asus/p8z77-m_pro/Makefile.inc b/src/mainboard/asus/p8z77-m_pro/Makefile.inc
deleted file mode 100644
index 26b20d7ece..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-## SPDX-License-Identifier: GPL-2.0-or-later
-
-bootblock-y += gpio.c
-romstage-y += gpio.c
-
-ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-bootblock-y += early_init.c
-romstage-y += early_init.c
diff --git a/src/mainboard/asus/p8z77-m_pro/acpi/ec.asl b/src/mainboard/asus/p8z77-m_pro/acpi/ec.asl
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/acpi/ec.asl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/mainboard/asus/p8z77-m_pro/acpi/platform.asl b/src/mainboard/asus/p8z77-m_pro/acpi/platform.asl
deleted file mode 100644
index 90cf05bf75..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/acpi/platform.asl
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-Method(_PTS,1)
-{
-}
-
-Method(_WAK,1)
-{
-	Return(Package(){0,0})
-}
diff --git a/src/mainboard/asus/p8z77-m_pro/acpi/superio.asl b/src/mainboard/asus/p8z77-m_pro/acpi/superio.asl
deleted file mode 100644
index ee2eabeb75..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/acpi/superio.asl
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <drivers/pc80/pc/ps2_controller.asl>
diff --git a/src/mainboard/asus/p8z77-m_pro/dsdt.asl b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
deleted file mode 100644
index 19a528f694..0000000000
--- a/src/mainboard/asus/p8z77-m_pro/dsdt.asl
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi.h>
-DefinitionBlock(
-	"dsdt.aml",
-	"DSDT",
-	ACPI_DSDT_REV_2,
-	OEM_ID,
-	ACPI_TABLE_CREATOR,
-	0x20141018	/* OEM revision */
-)
-{
-	#include <acpi/dsdt_top.asl>
-	#include "acpi/platform.asl"
-	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/common/acpi/platform.asl>
-
-	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
-	#include <southbridge/intel/common/acpi/sleepstates.asl>
-
-	Device (\_SB.PCI0)
-	{
-		#include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
-		#include <southbridge/intel/bd82x6x/acpi/pch.asl>
-	}
-}
diff --git a/src/mainboard/asus/p8z77-series/Kconfig b/src/mainboard/asus/p8z77-series/Kconfig
index 99c76a0418..8927ff5fd5 100644
--- a/src/mainboard/asus/p8z77-series/Kconfig
+++ b/src/mainboard/asus/p8z77-series/Kconfig
@@ -20,10 +20,12 @@ config MAINBOARD_DIR
 
 config VARIANT_DIR
 	string
+	default "p8z77-m_pro" if BOARD_ASUS_P8Z77_M_PRO
 	default "p8z77-v_lx2" if BOARD_ASUS_P8Z77_V_LX2
 
 config MAINBOARD_PART_NUMBER
 	string
+	default "P8Z77-M PRO" if BOARD_ASUS_P8Z77_M_PRO
 	default "P8Z77-V LX2" if BOARD_ASUS_P8Z77_V_LX2
 
 config DEVICETREE
diff --git a/src/mainboard/asus/p8z77-series/Kconfig.name b/src/mainboard/asus/p8z77-series/Kconfig.name
index 4ab8943dcf..44dae8127a 100644
--- a/src/mainboard/asus/p8z77-series/Kconfig.name
+++ b/src/mainboard/asus/p8z77-series/Kconfig.name
@@ -1,3 +1,13 @@
+config BOARD_ASUS_P8Z77_M_PRO
+	bool "P8Z77-M PRO"
+	select BOARD_ASUS_P8Z77_SERIES
+	select BOARD_ROMSIZE_KB_8192
+	select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
+	select INTEL_INT15
+	select MAINBOARD_HAS_LPC_TPM
+	select MAINBOARD_HAS_TPM1
+	select SUPERIO_NUVOTON_NCT6779D
+
 config BOARD_ASUS_P8Z77_V_LX2
 	bool "P8Z77-V LX2"
 	select BOARD_ASUS_P8Z77_SERIES
diff --git a/src/mainboard/asus/p8z77-m_pro/mainboard.c b/src/mainboard/asus/p8z77-series/mainboard.c
index ac992f6ffb..bc45baf8a7 100644
--- a/src/mainboard/asus/p8z77-m_pro/mainboard.c
+++ b/src/mainboard/asus/p8z77-series/mainboard.c
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+/* TODO: remove */
+#if CONFIG(INTEL_INT15)
+
 #include <device/device.h>
 #include <drivers/intel/gma/int15.h>
 
@@ -14,3 +17,5 @@ static void mainboard_enable(struct device *dev)
 struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable
 };
+
+#endif
diff --git a/src/mainboard/asus/p8z77-m_pro/board_info.txt b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/board_info.txt
index 66e6f0d6f9..66e6f0d6f9 100644
--- a/src/mainboard/asus/p8z77-m_pro/board_info.txt
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/board_info.txt
diff --git a/src/mainboard/asus/p8z77-m_pro/cmos.default b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/cmos.default
index 6811b0b076..6811b0b076 100644
--- a/src/mainboard/asus/p8z77-m_pro/cmos.default
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/cmos.default
diff --git a/src/mainboard/asus/p8z77-m_pro/cmos.layout b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/cmos.layout
index 3d717b444d..3d717b444d 100644
--- a/src/mainboard/asus/p8z77-m_pro/cmos.layout
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/cmos.layout
diff --git a/src/mainboard/asus/p8z77-m_pro/data.vbt b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/data.vbt
index 34679b36a9..34679b36a9 100644
--- a/src/mainboard/asus/p8z77-m_pro/data.vbt
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/data.vbt
diff --git a/src/mainboard/asus/p8z77-m_pro/devicetree.cb b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/devicetree.cb
index a915499502..a915499502 100644
--- a/src/mainboard/asus/p8z77-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/devicetree.cb
diff --git a/src/mainboard/asus/p8z77-m_pro/early_init.c b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/early_init.c
index 78ad877715..78ad877715 100644
--- a/src/mainboard/asus/p8z77-m_pro/early_init.c
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/early_init.c
diff --git a/src/mainboard/asus/p8z77-m_pro/gma-mainboard.ads b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/gma-mainboard.ads
index 09d2e1556a..09d2e1556a 100644
--- a/src/mainboard/asus/p8z77-m_pro/gma-mainboard.ads
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/gma-mainboard.ads
diff --git a/src/mainboard/asus/p8z77-m_pro/gpio.c b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/gpio.c
index 2455bd6711..2455bd6711 100644
--- a/src/mainboard/asus/p8z77-m_pro/gpio.c
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/gpio.c
diff --git a/src/mainboard/asus/p8z77-m_pro/hda_verb.c b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/hda_verb.c
index a4a7a3e091..a4a7a3e091 100644
--- a/src/mainboard/asus/p8z77-m_pro/hda_verb.c
+++ b/src/mainboard/asus/p8z77-series/variants/p8z77-m_pro/hda_verb.c