diff options
22 files changed, 61 insertions, 40 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6a668e52e949..f6ee6dd3b4a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -201,10 +201,10 @@ M: Vlado Cibic <vladocb@protonmail.com> S: Maintained F: src/mainboard/asus/p8z77-m_pro/ -ASUS P8Z77-V LX2 MAINBOARD +ASUS P8Z77 SERIES MAINBOARDS M: Angel Pons <th3fanbus@gmail.com> 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 000000000000..99c76a0418fe --- /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 000000000000..4ab8943dcfc4 --- /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 000000000000..e3392856201a --- /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 e69de29bb2d1..e69de29bb2d1 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 7da03bfddd02..7da03bfddd02 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 f2b35ba9c175..f2b35ba9c175 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 000000000000..8f74c04efde2 --- /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 e8e2b3a3e560..e8e2b3a3e560 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 000000000000..e69de29bb2d1 --- /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 79c36d68370e..79c36d68370e 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 c7aa6208f41e..c7aa6208f41e 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 0f9de5ed1864..0f9de5ed1864 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 f8151e1678f0..f8151e1678f0 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 40f8e6db2b60..40f8e6db2b60 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 3a297f9e3871..3a297f9e3871 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 aa8a70d15618..aa8a70d15618 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 9e59cd8b5661..9e59cd8b5661 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 650cd7c99095..650cd7c99095 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 108d61a6d6a7..000000000000 --- 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 0dec75f4a7e8..000000000000 --- 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 7167e1012304..000000000000 --- 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 |