summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-05-17 13:03:36 +0200
committerPatrick Georgi <pgeorgi@google.com>2021-05-18 11:51:02 +0000
commit9d54a228092e627ad7f159bb21e45c468c2f9f2c (patch)
tree1909eb5bcf8b25a2d7aa027ded23bf7db6fd74f7 /src/mainboard
parent14b7e655bf876e8389bc83bc30e702ca3c58e845 (diff)
downloadcoreboot-9d54a228092e627ad7f159bb21e45c468c2f9f2c.tar.xz
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> Reviewed-on: https://review.coreboot.org/c/coreboot/+/54374 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/asus/h61-series/Kconfig2
-rw-r--r--src/mainboard/asus/h61-series/Kconfig.name10
-rw-r--r--src/mainboard/asus/h61-series/mainboard.c (renamed from src/mainboard/asus/h61m-cs/mainboard.c)5
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/board_info.txt (renamed from src/mainboard/asus/h61m-cs/board_info.txt)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/cmos.default (renamed from src/mainboard/asus/h61m-cs/cmos.default)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/cmos.layout (renamed from src/mainboard/asus/h61m-cs/cmos.layout)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/data.vbt (renamed from src/mainboard/asus/h61m-cs/data.vbt)bin3902 -> 3902 bytes
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/devicetree.cb (renamed from src/mainboard/asus/h61m-cs/devicetree.cb)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/early_init.c (renamed from src/mainboard/asus/h61m-cs/early_init.c)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/gma-mainboard.ads (renamed from src/mainboard/asus/h61m-cs/gma-mainboard.ads)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/gpio.c (renamed from src/mainboard/asus/h61m-cs/gpio.c)0
-rw-r--r--src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c (renamed from src/mainboard/asus/h61m-cs/hda_verb.c)0
-rw-r--r--src/mainboard/asus/h61m-cs/Kconfig27
-rw-r--r--src/mainboard/asus/h61m-cs/Kconfig.name2
-rw-r--r--src/mainboard/asus/h61m-cs/Makefile.inc5
-rw-r--r--src/mainboard/asus/h61m-cs/acpi/ec.asl0
-rw-r--r--src/mainboard/asus/h61m-cs/acpi/platform.asl10
-rw-r--r--src/mainboard/asus/h61m-cs/acpi/superio.asl1
-rw-r--r--src/mainboard/asus/h61m-cs/dsdt.asl25
19 files changed, 17 insertions, 70 deletions
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig
index 959580f48e..212c06b33d 100644
--- a/src/mainboard/asus/h61-series/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -19,11 +19,13 @@ config MAINBOARD_DIR
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 d876aea3b7..6bb8d45743 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
index c834fea5d3..48fcdce34e 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 @@ static void mainboard_enable(struct device *dev)
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
index d16d93036e..d16d93036e 100644
--- a/src/mainboard/asus/h61m-cs/board_info.txt
+++ b/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
index c1b9aa98f1..c1b9aa98f1 100644
--- a/src/mainboard/asus/h61m-cs/cmos.default
+++ b/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
index 8c6a055ca3..8c6a055ca3 100644
--- a/src/mainboard/asus/h61m-cs/cmos.layout
+++ b/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
index 16e13f2b40..16e13f2b40 100644
--- a/src/mainboard/asus/h61m-cs/data.vbt
+++ b/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
index 3ec5e5fa28..3ec5e5fa28 100644
--- a/src/mainboard/asus/h61m-cs/devicetree.cb
+++ b/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
index cb8daaf014..cb8daaf014 100644
--- a/src/mainboard/asus/h61m-cs/early_init.c
+++ b/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
index f07946ae2d..f07946ae2d 100644
--- a/src/mainboard/asus/h61m-cs/gma-mainboard.ads
+++ b/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
index 39b7effffe..39b7effffe 100644
--- a/src/mainboard/asus/h61m-cs/gpio.c
+++ b/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
index 0a3a75c5db..0a3a75c5db 100644
--- a/src/mainboard/asus/h61m-cs/hda_verb.c
+++ b/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 83ea89a53b..0000000000
--- 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 7a111b1a57..0000000000
--- 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 f0b34f9840..0000000000
--- 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 e69de29bb2..0000000000
--- 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 90cf05bf75..0000000000
--- 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 f2b35ba9c1..0000000000
--- 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 3bd9251967..0000000000
--- 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>
- }
-}