From 81c2e02bb49f517e21e89806e372d7708c54beb1 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 17 May 2021 17:45:54 +0200 Subject: [PATCH] mb/asus/p8z77-v_lx2: Transform into variant setup Get ready to squash all Asus Z77 boards together, so as to factor out some redundant code. Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8Z77-V LX2 remains identical when not adding the .config file in it. Change-Id: I701ec4adbc65732ffc0a60d311bf07bf7f414ebf Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/54409 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- MAINTAINERS | 4 +- src/mainboard/asus/p8z77-series/Kconfig | 39 ++++++++++++++++++ src/mainboard/asus/p8z77-series/Kconfig.name | 7 ++++ src/mainboard/asus/p8z77-series/Makefile.inc | 8 ++++ .../{p8z77-v_lx2 => p8z77-series}/acpi/ec.asl | 0 .../acpi/platform.asl | 0 .../acpi/superio.asl | 0 .../asus/p8z77-series/board_info.txt | 5 +++ .../{p8z77-v_lx2 => p8z77-series}/dsdt.asl | 0 src/mainboard/asus/p8z77-series/hda_verb.c | 0 .../variants}/p8z77-v_lx2/board_info.txt | 0 .../variants}/p8z77-v_lx2/cmos.default | 0 .../variants}/p8z77-v_lx2/cmos.layout | 0 .../variants}/p8z77-v_lx2/data.vbt | Bin .../variants}/p8z77-v_lx2/devicetree.cb | 0 .../variants}/p8z77-v_lx2/early_init.c | 0 .../variants}/p8z77-v_lx2/gma-mainboard.ads | 0 .../variants}/p8z77-v_lx2/gpio.c | 0 .../variants}/p8z77-v_lx2/hda_verb.c | 0 src/mainboard/asus/p8z77-v_lx2/Kconfig | 29 ------------- src/mainboard/asus/p8z77-v_lx2/Kconfig.name | 2 - src/mainboard/asus/p8z77-v_lx2/Makefile.inc | 7 ---- 22 files changed, 61 insertions(+), 40 deletions(-) create mode 100644 src/mainboard/asus/p8z77-series/Kconfig create mode 100644 src/mainboard/asus/p8z77-series/Kconfig.name create mode 100644 src/mainboard/asus/p8z77-series/Makefile.inc rename src/mainboard/asus/{p8z77-v_lx2 => p8z77-series}/acpi/ec.asl (100%) rename src/mainboard/asus/{p8z77-v_lx2 => p8z77-series}/acpi/platform.asl (100%) rename src/mainboard/asus/{p8z77-v_lx2 => p8z77-series}/acpi/superio.asl (100%) create mode 100644 src/mainboard/asus/p8z77-series/board_info.txt rename src/mainboard/asus/{p8z77-v_lx2 => p8z77-series}/dsdt.asl (100%) create mode 100644 src/mainboard/asus/p8z77-series/hda_verb.c rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/board_info.txt (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/cmos.default (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/cmos.layout (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/data.vbt (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/devicetree.cb (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/early_init.c (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/gma-mainboard.ads (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/gpio.c (100%) rename src/mainboard/asus/{ => p8z77-series/variants}/p8z77-v_lx2/hda_verb.c (100%) delete mode 100644 src/mainboard/asus/p8z77-v_lx2/Kconfig delete mode 100644 src/mainboard/asus/p8z77-v_lx2/Kconfig.name delete mode 100644 src/mainboard/asus/p8z77-v_lx2/Makefile.inc diff --git a/MAINTAINERS b/MAINTAINERS index 6a668e52e9..f6ee6dd3b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -201,10 +201,10 @@ M: Vlado Cibic S: Maintained F: src/mainboard/asus/p8z77-m_pro/ -ASUS P8Z77-V LX2 MAINBOARD +ASUS P8Z77 SERIES MAINBOARDS M: Angel Pons S: Maintained -F: src/mainboard/asus/p8z77-v_lx2/ +F: src/mainboard/asus/p8z77-series/ diff --git a/src/mainboard/asus/p8z77-series/Kconfig b/src/mainboard/asus/p8z77-series/Kconfig new file mode 100644 index 0000000000..99c76a0418 --- /dev/null +++ b/src/mainboard/asus/p8z77-series/Kconfig @@ -0,0 +1,39 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config BOARD_ASUS_P8Z77_SERIES + bool + select HAVE_ACPI_RESUME + select HAVE_ACPI_TABLES + select HAVE_CMOS_DEFAULT + select HAVE_OPTION_TABLE + select INTEL_GMA_HAVE_VBT + select MAINBOARD_HAS_LIBGFXINIT + select NORTHBRIDGE_INTEL_SANDYBRIDGE + select SERIRQ_CONTINUOUS_MODE + select SOUTHBRIDGE_INTEL_C216 + +if BOARD_ASUS_P8Z77_SERIES + +config MAINBOARD_DIR + string + default "asus/p8z77-series" + +config VARIANT_DIR + string + default "p8z77-v_lx2" if BOARD_ASUS_P8Z77_V_LX2 + +config MAINBOARD_PART_NUMBER + string + default "P8Z77-V LX2" if BOARD_ASUS_P8Z77_V_LX2 + +config DEVICETREE + string + default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb" + +config CMOS_DEFAULT_FILE + default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/cmos.default" + +config CMOS_LAYOUT_FILE + default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/cmos.layout" + +endif diff --git a/src/mainboard/asus/p8z77-series/Kconfig.name b/src/mainboard/asus/p8z77-series/Kconfig.name new file mode 100644 index 0000000000..4ab8943dcf --- /dev/null +++ b/src/mainboard/asus/p8z77-series/Kconfig.name @@ -0,0 +1,7 @@ +config BOARD_ASUS_P8Z77_V_LX2 + bool "P8Z77-V LX2" + select BOARD_ASUS_P8Z77_SERIES + select BOARD_ROMSIZE_KB_8192 + select REALTEK_8168_RESET + select SUPERIO_NUVOTON_NCT6779D + select USE_NATIVE_RAMINIT diff --git a/src/mainboard/asus/p8z77-series/Makefile.inc b/src/mainboard/asus/p8z77-series/Makefile.inc new file mode 100644 index 0000000000..e339285620 --- /dev/null +++ b/src/mainboard/asus/p8z77-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/p8z77-v_lx2/acpi/ec.asl b/src/mainboard/asus/p8z77-series/acpi/ec.asl similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/acpi/ec.asl rename to src/mainboard/asus/p8z77-series/acpi/ec.asl diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl b/src/mainboard/asus/p8z77-series/acpi/platform.asl similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl rename to src/mainboard/asus/p8z77-series/acpi/platform.asl diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl b/src/mainboard/asus/p8z77-series/acpi/superio.asl similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl rename to src/mainboard/asus/p8z77-series/acpi/superio.asl diff --git a/src/mainboard/asus/p8z77-series/board_info.txt b/src/mainboard/asus/p8z77-series/board_info.txt new file mode 100644 index 0000000000..8f74c04efd --- /dev/null +++ b/src/mainboard/asus/p8z77-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/p8z77-v_lx2/dsdt.asl b/src/mainboard/asus/p8z77-series/dsdt.asl similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/dsdt.asl rename to src/mainboard/asus/p8z77-series/dsdt.asl diff --git a/src/mainboard/asus/p8z77-series/hda_verb.c b/src/mainboard/asus/p8z77-series/hda_verb.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/mainboard/asus/p8z77-v_lx2/board_info.txt b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/board_info.txt similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/board_info.txt rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/board_info.txt diff --git a/src/mainboard/asus/p8z77-v_lx2/cmos.default b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/cmos.default similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/cmos.default rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/cmos.default diff --git a/src/mainboard/asus/p8z77-v_lx2/cmos.layout b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/cmos.layout similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/cmos.layout rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/cmos.layout diff --git a/src/mainboard/asus/p8z77-v_lx2/data.vbt b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/data.vbt similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/data.vbt rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/data.vbt diff --git a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/devicetree.cb similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/devicetree.cb rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/devicetree.cb diff --git a/src/mainboard/asus/p8z77-v_lx2/early_init.c b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/early_init.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/early_init.c rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/early_init.c diff --git a/src/mainboard/asus/p8z77-v_lx2/gma-mainboard.ads b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/gma-mainboard.ads similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/gma-mainboard.ads rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/gma-mainboard.ads diff --git a/src/mainboard/asus/p8z77-v_lx2/gpio.c b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/gpio.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/gpio.c rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/gpio.c diff --git a/src/mainboard/asus/p8z77-v_lx2/hda_verb.c b/src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/hda_verb.c similarity index 100% rename from src/mainboard/asus/p8z77-v_lx2/hda_verb.c rename to src/mainboard/asus/p8z77-series/variants/p8z77-v_lx2/hda_verb.c diff --git a/src/mainboard/asus/p8z77-v_lx2/Kconfig b/src/mainboard/asus/p8z77-v_lx2/Kconfig deleted file mode 100644 index 108d61a6d6..0000000000 --- a/src/mainboard/asus/p8z77-v_lx2/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -if BOARD_ASUS_P8Z77_V_LX2 - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_8192 - select HAVE_ACPI_RESUME - select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE - select INTEL_GMA_HAVE_VBT - select MAINBOARD_HAS_LIBGFXINIT - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select REALTEK_8168_RESET - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_NUVOTON_NCT6779D - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "asus/p8z77-v_lx2" - -config MAINBOARD_PART_NUMBER - string - default "P8Z77-V LX2" - -endif diff --git a/src/mainboard/asus/p8z77-v_lx2/Kconfig.name b/src/mainboard/asus/p8z77-v_lx2/Kconfig.name deleted file mode 100644 index 0dec75f4a7..0000000000 --- a/src/mainboard/asus/p8z77-v_lx2/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_P8Z77_V_LX2 - bool "P8Z77-V LX2" diff --git a/src/mainboard/asus/p8z77-v_lx2/Makefile.inc b/src/mainboard/asus/p8z77-v_lx2/Makefile.inc deleted file mode 100644 index 7167e10123..0000000000 --- a/src/mainboard/asus/p8z77-v_lx2/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