Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54374 )
Change subject: mb/asus/h61m-cs: Transform into variant setup ......................................................................
mb/asus/h61m-cs: Transform into variant setup
To preserve reproducibility, temporarily guard mainboard.c contents. This will be removed once all boards have become variants.
Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus H61M-CS remains identical when not adding the .config file in it.
Change-Id: I1ffb41470d24713a4a7f0689958b733d4b1bdf52 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/asus/h61-series/Kconfig M src/mainboard/asus/h61-series/Kconfig.name R src/mainboard/asus/h61-series/mainboard.c R src/mainboard/asus/h61-series/variants/h61m-cs/board_info.txt R src/mainboard/asus/h61-series/variants/h61m-cs/cmos.default R src/mainboard/asus/h61-series/variants/h61m-cs/cmos.layout R src/mainboard/asus/h61-series/variants/h61m-cs/data.vbt R src/mainboard/asus/h61-series/variants/h61m-cs/devicetree.cb R src/mainboard/asus/h61-series/variants/h61m-cs/early_init.c R src/mainboard/asus/h61-series/variants/h61m-cs/gma-mainboard.ads R src/mainboard/asus/h61-series/variants/h61m-cs/gpio.c R src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c D src/mainboard/asus/h61m-cs/Kconfig D src/mainboard/asus/h61m-cs/Kconfig.name D src/mainboard/asus/h61m-cs/Makefile.inc D src/mainboard/asus/h61m-cs/acpi/ec.asl D src/mainboard/asus/h61m-cs/acpi/platform.asl D src/mainboard/asus/h61m-cs/acpi/superio.asl D src/mainboard/asus/h61m-cs/dsdt.asl 19 files changed, 17 insertions(+), 70 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/54374/1
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 959580f..212c06b 100644 --- a/src/mainboard/asus/h61-series/Kconfig +++ b/src/mainboard/asus/h61-series/Kconfig @@ -19,11 +19,13 @@
config VARIANT_DIR string + default "h61m-cs" if BOARD_ASUS_H61M_CS default "p8h61-m_lx3_r2_0" if BOARD_ASUS_P8H61_M_LX3_R2_0 default "p8h61-m_pro" if BOARD_ASUS_P8H61_M_PRO
config MAINBOARD_PART_NUMBER string + default "H61M-CS" if BOARD_ASUS_H61M_CS default "P8H61-M LX3 R2.0" if BOARD_ASUS_P8H61_M_LX3_R2_0 default "P8H61-M PRO" if BOARD_ASUS_P8H61_M_PRO
diff --git a/src/mainboard/asus/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name index d876aea..6bb8d45 100644 --- a/src/mainboard/asus/h61-series/Kconfig.name +++ b/src/mainboard/asus/h61-series/Kconfig.name @@ -1,3 +1,13 @@ +config BOARD_ASUS_H61M_CS + bool "H61M-CS" + select BOARD_ASUS_H61_SERIES + select BOARD_ROMSIZE_KB_8192 + select HAVE_CMOS_DEFAULT + select HAVE_OPTION_TABLE + select INTEL_INT15 + select NO_UART_ON_SUPERIO + select SUPERIO_NUVOTON_NCT6779D + config BOARD_ASUS_P8H61_M_LX3_R2_0 bool "P8H61-M LX3 R2.0" select BOARD_ASUS_H61_SERIES diff --git a/src/mainboard/asus/h61m-cs/mainboard.c b/src/mainboard/asus/h61-series/mainboard.c similarity index 87% rename from src/mainboard/asus/h61m-cs/mainboard.c rename to src/mainboard/asus/h61-series/mainboard.c index c834fea..48fcdce 100644 --- a/src/mainboard/asus/h61m-cs/mainboard.c +++ b/src/mainboard/asus/h61-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>
@@ -13,3 +16,5 @@ struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; + +#endif diff --git a/src/mainboard/asus/h61m-cs/board_info.txt b/src/mainboard/asus/h61-series/variants/h61m-cs/board_info.txt similarity index 100% rename from src/mainboard/asus/h61m-cs/board_info.txt rename to src/mainboard/asus/h61-series/variants/h61m-cs/board_info.txt diff --git a/src/mainboard/asus/h61m-cs/cmos.default b/src/mainboard/asus/h61-series/variants/h61m-cs/cmos.default similarity index 100% rename from src/mainboard/asus/h61m-cs/cmos.default rename to src/mainboard/asus/h61-series/variants/h61m-cs/cmos.default diff --git a/src/mainboard/asus/h61m-cs/cmos.layout b/src/mainboard/asus/h61-series/variants/h61m-cs/cmos.layout similarity index 100% rename from src/mainboard/asus/h61m-cs/cmos.layout rename to src/mainboard/asus/h61-series/variants/h61m-cs/cmos.layout diff --git a/src/mainboard/asus/h61m-cs/data.vbt b/src/mainboard/asus/h61-series/variants/h61m-cs/data.vbt similarity index 100% rename from src/mainboard/asus/h61m-cs/data.vbt rename to src/mainboard/asus/h61-series/variants/h61m-cs/data.vbt Binary files differ diff --git a/src/mainboard/asus/h61m-cs/devicetree.cb b/src/mainboard/asus/h61-series/variants/h61m-cs/devicetree.cb similarity index 100% rename from src/mainboard/asus/h61m-cs/devicetree.cb rename to src/mainboard/asus/h61-series/variants/h61m-cs/devicetree.cb diff --git a/src/mainboard/asus/h61m-cs/early_init.c b/src/mainboard/asus/h61-series/variants/h61m-cs/early_init.c similarity index 100% rename from src/mainboard/asus/h61m-cs/early_init.c rename to src/mainboard/asus/h61-series/variants/h61m-cs/early_init.c diff --git a/src/mainboard/asus/h61m-cs/gma-mainboard.ads b/src/mainboard/asus/h61-series/variants/h61m-cs/gma-mainboard.ads similarity index 100% rename from src/mainboard/asus/h61m-cs/gma-mainboard.ads rename to src/mainboard/asus/h61-series/variants/h61m-cs/gma-mainboard.ads diff --git a/src/mainboard/asus/h61m-cs/gpio.c b/src/mainboard/asus/h61-series/variants/h61m-cs/gpio.c similarity index 100% rename from src/mainboard/asus/h61m-cs/gpio.c rename to src/mainboard/asus/h61-series/variants/h61m-cs/gpio.c diff --git a/src/mainboard/asus/h61m-cs/hda_verb.c b/src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c similarity index 100% rename from src/mainboard/asus/h61m-cs/hda_verb.c rename to src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c diff --git a/src/mainboard/asus/h61m-cs/Kconfig b/src/mainboard/asus/h61m-cs/Kconfig deleted file mode 100644 index 83ea89a..0000000 --- a/src/mainboard/asus/h61m-cs/Kconfig +++ /dev/null @@ -1,27 +0,0 @@ -if BOARD_ASUS_H61M_CS - -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 INTEL_INT15 - select MAINBOARD_HAS_LIBGFXINIT - select NO_UART_ON_SUPERIO - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_BD82X6X - select SUPERIO_NUVOTON_NCT6779D - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "asus/h61m-cs" - -config MAINBOARD_PART_NUMBER - string - default "H61M-CS" -endif diff --git a/src/mainboard/asus/h61m-cs/Kconfig.name b/src/mainboard/asus/h61m-cs/Kconfig.name deleted file mode 100644 index 7a111b1..0000000 --- a/src/mainboard/asus/h61m-cs/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_H61M_CS - bool "H61M-CS" diff --git a/src/mainboard/asus/h61m-cs/Makefile.inc b/src/mainboard/asus/h61m-cs/Makefile.inc deleted file mode 100644 index f0b34f9..0000000 --- a/src/mainboard/asus/h61m-cs/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -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/h61m-cs/acpi/ec.asl b/src/mainboard/asus/h61m-cs/acpi/ec.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/asus/h61m-cs/acpi/ec.asl +++ /dev/null diff --git a/src/mainboard/asus/h61m-cs/acpi/platform.asl b/src/mainboard/asus/h61m-cs/acpi/platform.asl deleted file mode 100644 index 90cf05b..0000000 --- a/src/mainboard/asus/h61m-cs/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/h61m-cs/acpi/superio.asl b/src/mainboard/asus/h61m-cs/acpi/superio.asl deleted file mode 100644 index f2b35ba..0000000 --- a/src/mainboard/asus/h61m-cs/acpi/superio.asl +++ /dev/null @@ -1 +0,0 @@ -#include <drivers/pc80/pc/ps2_controller.asl> diff --git a/src/mainboard/asus/h61m-cs/dsdt.asl b/src/mainboard/asus/h61m-cs/dsdt.asl deleted file mode 100644 index 3bd9251..0000000 --- a/src/mainboard/asus/h61m-cs/dsdt.asl +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#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> - /* global NVS and variables. */ - #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> - } -}
-
Angel Pons (Code Review)