diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2021-05-17 17:45:54 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-05-20 17:49:11 +0000 |
| commit | 81c2e02bb49f517e21e89806e372d7708c54beb1 (patch) | |
| tree | d08f9501ab02381b200b1b333d77559d108297b0 /src | |
| parent | ee5b24d232fea4bf6f097463b38f43f3e6bc9e29 (diff) | |
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 <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54409
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src')
21 files changed, 59 insertions, 38 deletions
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 index e69de29bb2..e69de29bb2 100644 --- a/src/mainboard/asus/p8z77-v_lx2/acpi/ec.asl +++ b/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 index 7da03bfddd..7da03bfddd 100644 --- a/src/mainboard/asus/p8z77-v_lx2/acpi/platform.asl +++ b/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 index f2b35ba9c1..f2b35ba9c1 100644 --- a/src/mainboard/asus/p8z77-v_lx2/acpi/superio.asl +++ b/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 index e8e2b3a3e5..e8e2b3a3e5 100644 --- a/src/mainboard/asus/p8z77-v_lx2/dsdt.asl +++ b/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 --- /dev/null +++ b/src/mainboard/asus/p8z77-series/hda_verb.c 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 index 79c36d6837..79c36d6837 100644 --- a/src/mainboard/asus/p8z77-v_lx2/board_info.txt +++ b/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 index c7aa6208f4..c7aa6208f4 100644 --- a/src/mainboard/asus/p8z77-v_lx2/cmos.default +++ b/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 index 0f9de5ed18..0f9de5ed18 100644 --- a/src/mainboard/asus/p8z77-v_lx2/cmos.layout +++ b/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 Binary files differindex f8151e1678..f8151e1678 100644 --- a/src/mainboard/asus/p8z77-v_lx2/data.vbt +++ b/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 index 40f8e6db2b..40f8e6db2b 100644 --- a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb +++ b/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 index 3a297f9e38..3a297f9e38 100644 --- a/src/mainboard/asus/p8z77-v_lx2/early_init.c +++ b/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 index aa8a70d156..aa8a70d156 100644 --- a/src/mainboard/asus/p8z77-v_lx2/gma-mainboard.ads +++ b/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 index 9e59cd8b56..9e59cd8b56 100644 --- a/src/mainboard/asus/p8z77-v_lx2/gpio.c +++ b/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 index 650cd7c990..650cd7c990 100644 --- a/src/mainboard/asus/p8z77-v_lx2/hda_verb.c +++ b/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 |