Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54372 )
Change subject: mb/asus/p8h61-m_lx3_r2_0: Transform into variant setup ......................................................................
mb/asus/p8h61-m_lx3_r2_0: Transform into variant setup
Get ready to squash all Asus H61 boards together, so as to factor out lots of redundant code.
Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8H61-M LX3 R2.0 remains identical when not adding the .config file in it.
Change-Id: I738197bf4d5ea8b879ae26ecbcb0cf3714316662 Signed-off-by: Angel Pons th3fanbus@gmail.com --- A src/mainboard/asus/h61-series/Kconfig A src/mainboard/asus/h61-series/Kconfig.name A src/mainboard/asus/h61-series/Makefile.inc R src/mainboard/asus/h61-series/acpi/ec.asl R src/mainboard/asus/h61-series/acpi/platform.asl R src/mainboard/asus/h61-series/acpi/superio.asl A src/mainboard/asus/h61-series/board_info.txt R src/mainboard/asus/h61-series/dsdt.asl C src/mainboard/asus/h61-series/hda_verb.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/board_info.txt R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/data.vbt R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/early_init.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/gma-mainboard.ads R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/gpio.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c D src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig D src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig.name D src/mainboard/asus/p8h61-m_lx3_r2_0/Makefile.inc 19 files changed, 53 insertions(+), 38 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/54372/1
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig new file mode 100644 index 0000000..2ef6642 --- /dev/null +++ b/src/mainboard/asus/h61-series/Kconfig @@ -0,0 +1,32 @@ +## SPDX-License-Identifier: GPL-2.0-only + +config BOARD_ASUS_H61_SERIES + bool + select HAVE_ACPI_RESUME + select HAVE_ACPI_TABLES + select INTEL_GMA_HAVE_VBT + select MAINBOARD_HAS_LIBGFXINIT + select NORTHBRIDGE_INTEL_SANDYBRIDGE + select SERIRQ_CONTINUOUS_MODE + select SOUTHBRIDGE_INTEL_BD82X6X + select USE_NATIVE_RAMINIT + +if BOARD_ASUS_H61_SERIES + +config MAINBOARD_DIR + string + 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" 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 0000000..14ca540 --- /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 0000000..e339285 --- /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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/ec.asl rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/platform.asl rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/superio.asl rename to 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 0000000..8f74c04 --- /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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl rename to src/mainboard/asus/h61-series/dsdt.asl diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/ec.asl b/src/mainboard/asus/h61-series/hda_verb.c similarity index 100% copy from src/mainboard/asus/p8h61-m_lx3_r2_0/acpi/ec.asl copy to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/board_info.txt rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/data.vbt rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/data.vbt Binary files differ 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/early_init.c rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/gma-mainboard.ads rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/gpio.c rename to 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 similarity index 100% rename from src/mainboard/asus/p8h61-m_lx3_r2_0/hda_verb.c rename to 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 b/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig deleted file mode 100644 index 16fbbb8..0000000 --- a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -## 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 - 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 - -config MAINBOARD_DIR - string - default "asus/p8h61-m_lx3_r2_0" - -config MAINBOARD_PART_NUMBER - string - default "P8H61-M LX3 R2.0" - -endif 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 6d10dcf..0000000 --- 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 7167e10..0000000 --- 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