coreboot-gerrit May 2021

coreboot-gerrit@coreboot.org

1 participants
6048 discussions

Change in coreboot[master]: mb/asus/h61m-series/mainboard.c: Remove temporary guard
by Angel Pons (Code Review) 17 May '21

17 May '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54379 ) Change subject: mb/asus/h61m-series/mainboard.c: Remove temporary guard ...................................................................... mb/asus/h61m-series/mainboard.c: Remove temporary guard This guard was only added to preserve reproducibility when unifying the boards, but is not necessary. The `install_intel_vga_int15_handler` function does nothing when `VGA_ROM_RUN` is not selected. Change-Id: If51a0ab1c57b0856018a62cf669e5d1b53e5333c Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/asus/h61-series/mainboard.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/54379/1 diff --git a/src/mainboard/asus/h61-series/mainboard.c b/src/mainboard/asus/h61-series/mainboard.c index 48fcdce..c834fea 100644 --- a/src/mainboard/asus/h61-series/mainboard.c +++ b/src/mainboard/asus/h61-series/mainboard.c @@ -1,8 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* TODO: remove */ -#if CONFIG(INTEL_INT15) - #include <device/device.h> #include <drivers/intel/gma/int15.h> @@ -16,5 +13,3 @@ struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; - -#endif -- To view, visit https://review.coreboot.org/c/coreboot/+/54379 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If51a0ab1c57b0856018a62cf669e5d1b53e5333c Gerrit-Change-Number: 54379 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/asus/h61-series: Consolidate devicetree SATA options
by Angel Pons (Code Review) 17 May '21

17 May '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54378 ) Change subject: mb/asus/h61-series: Consolidate devicetree SATA options ...................................................................... mb/asus/h61-series: Consolidate devicetree SATA options The H61 PCH only supports 4 SATA ports, and does not support Gen3. Change-Id: I3e060ca6904fd6c773c322988a17bbca28333a3d Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb M src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/54378/1 diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb index 9ad8661..62dbb37 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb @@ -19,7 +19,7 @@ chip southbridge/intel/bd82x6x register "c2_latency" = "0x0065" register "gen1_dec" = "0x000c0291" - register "sata_port_map" = "0x3f" + register "sata_port_map" = "0x33" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005" diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb index e1edde7..b1292e7 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb @@ -18,7 +18,6 @@ chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH register "c2_latency" = "0x0065" register "gen1_dec" = "0x000c0291" # HWM - register "sata_interface_speed_support" = "0x3" register "sata_port_map" = "0x33" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005" -- To view, visit https://review.coreboot.org/c/coreboot/+/54378 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3e060ca6904fd6c773c322988a17bbca28333a3d Gerrit-Change-Number: 54378 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/asus/h61-series: Relicense devicetrees as GPL-2.0-or-later
by Angel Pons (Code Review) 17 May '21

17 May '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54377 ) Change subject: mb/asus/h61-series: Relicense devicetrees as GPL-2.0-or-later ...................................................................... mb/asus/h61-series: Relicense devicetrees as GPL-2.0-or-later I added these devicetrees in commit 65ddbb720b1 (mb/asus/p8h61-m_pro: Add new mainboard) and commit fe7c2b996bbb (mb/asus/p8h61-m_lx3_r2_0: Add new mainboard). To ease licensing matters when transforming these boards to use overridetrees, relicense the devicetrees so that all of them use the GPL-2.0-or-later license. Change-Id: Id26d0d9dd6cbb81d6a6a263feab7f36ddb4ff6e6 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb M src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/54377/1 diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb index 317f9cc..9ad8661 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/devicetree.cb @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: GPL-2.0-only +## SPDX-License-Identifier: GPL-2.0-or-later chip northbridge/intel/sandybridge device cpu_cluster 0 on diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb index a0221fe..e1edde7 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: GPL-2.0-only +## SPDX-License-Identifier: GPL-2.0-or-later chip northbridge/intel/sandybridge device cpu_cluster 0 on -- To view, visit https://review.coreboot.org/c/coreboot/+/54377 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id26d0d9dd6cbb81d6a6a263feab7f36ddb4ff6e6 Gerrit-Change-Number: 54377 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/asus/p8h61-m_lx/devicetree.cb: Rewrite number in hex
by Angel Pons (Code Review) 17 May '21

17 May '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54376 ) Change subject: mb/asus/p8h61-m_lx/devicetree.cb: Rewrite number in hex ...................................................................... mb/asus/p8h61-m_lx/devicetree.cb: Rewrite number in hex Done for consistency with the other variants. Tested with BUILD_TIMELESS=1, Asus P8H61-M LX remains identical. Change-Id: I440706f6fa11d3c2410c445cb7e946c063578c4e Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/54376/1 diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb index 2761190..05b8e38 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb @@ -19,7 +19,7 @@ device pci 02.0 on end # VGA controller chip southbridge/intel/bd82x6x - register "c2_latency" = "101" + register "c2_latency" = "0x0065" register "gen1_dec" = "0x00000295" # Super I/O HWM register "sata_port_map" = "0x33" register "spi_lvscc" = "0x2005" -- To view, visit https://review.coreboot.org/c/coreboot/+/54376 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I440706f6fa11d3c2410c445cb7e946c063578c4e Gerrit-Change-Number: 54376 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/asus/p8h61-m_lx: Transform into variant setup
by Angel Pons (Code Review) 17 May '21

17 May '21

Attention is currently required from: Tristan Corrick. Hello Tristan Corrick, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/54375 to look at the new patch set (#2). Change subject: mb/asus/p8h61-m_lx: Transform into variant setup ...................................................................... mb/asus/p8h61-m_lx: Transform into variant setup Handle some differences in the DSDT code using preprocessor. Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8H61-M LX remains identical when not adding the .config file in it. Change-Id: I2a02f32dfd9fa9c1adce3baf0d279ea19db5883f Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M MAINTAINERS M src/mainboard/asus/h61-series/Kconfig M src/mainboard/asus/h61-series/Kconfig.name M src/mainboard/asus/h61-series/acpi/superio.asl M src/mainboard/asus/h61-series/dsdt.asl R src/mainboard/asus/h61-series/variants/p8h61-m_lx/board_info.txt R src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.default R src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.layout R src/mainboard/asus/h61-series/variants/p8h61-m_lx/data.vbt R src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb R src/mainboard/asus/h61-series/variants/p8h61-m_lx/early_init.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx/gma-mainboard.ads R src/mainboard/asus/h61-series/variants/p8h61-m_lx/gpio.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c D src/mainboard/asus/p8h61-m_lx/Kconfig D src/mainboard/asus/p8h61-m_lx/Kconfig.name D src/mainboard/asus/p8h61-m_lx/Makefile.inc D src/mainboard/asus/p8h61-m_lx/acpi/ec.asl D src/mainboard/asus/p8h61-m_lx/acpi/platform.asl D src/mainboard/asus/p8h61-m_lx/acpi/superio.asl D src/mainboard/asus/p8h61-m_lx/dsdt.asl D src/mainboard/asus/p8h61-m_lx/mainboard.c 22 files changed, 47 insertions(+), 119 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/54375/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/54375 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2a02f32dfd9fa9c1adce3baf0d279ea19db5883f Gerrit-Change-Number: 54375 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-Attention: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: mb/asus/p8h61-m_pro: Transform into variant setup
by Angel Pons (Code Review) 17 May '21

17 May '21

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/54373 to look at the new patch set (#2). Change subject: mb/asus/p8h61-m_pro: Transform into variant setup ...................................................................... mb/asus/p8h61-m_pro: Transform into variant setup Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8H61-M PRO remains identical when not adding the .config file in it. Change-Id: Iaa53a8a1b75f4c7359e32c6cd8c8a488c5763bbe Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M MAINTAINERS M src/mainboard/asus/h61-series/Kconfig M src/mainboard/asus/h61-series/Kconfig.name R src/mainboard/asus/h61-series/variants/p8h61-m_pro/board_info.txt R src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.default R src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.layout R src/mainboard/asus/h61-series/variants/p8h61-m_pro/data.vbt R src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb R src/mainboard/asus/h61-series/variants/p8h61-m_pro/early_init.c R src/mainboard/asus/h61-series/variants/p8h61-m_pro/gma-mainboard.ads R src/mainboard/asus/h61-series/variants/p8h61-m_pro/gpio.c R src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c D src/mainboard/asus/p8h61-m_pro/Kconfig D src/mainboard/asus/p8h61-m_pro/Kconfig.name D src/mainboard/asus/p8h61-m_pro/Makefile.inc D src/mainboard/asus/p8h61-m_pro/acpi/ec.asl D src/mainboard/asus/p8h61-m_pro/acpi/platform.asl D src/mainboard/asus/p8h61-m_pro/acpi/superio.asl D src/mainboard/asus/p8h61-m_pro/dsdt.asl 19 files changed, 20 insertions(+), 91 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/54373/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/54373 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iaa53a8a1b75f4c7359e32c6cd8c8a488c5763bbe Gerrit-Change-Number: 54373 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: mb/asus/p8h61-m_lx3_r2_0: Transform into variant setup
by Angel Pons (Code Review) 17 May '21

17 May '21

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/54372 to look at the new patch set (#2). 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(a)gmail.com> --- M MAINTAINERS 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 20 files changed, 58 insertions(+), 43 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/54372/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/54372 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I738197bf4d5ea8b879ae26ecbcb0cf3714316662 Gerrit-Change-Number: 54372 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: mb/asus/p8h61-m_lx: Transform into variant setup
by Angel Pons (Code Review) 17 May '21

17 May '21

Attention is currently required from: Tristan Corrick. Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54375 ) Change subject: mb/asus/p8h61-m_lx: Transform into variant setup ...................................................................... mb/asus/p8h61-m_lx: Transform into variant setup Handle some differences in the DSDT code using preprocessor. Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8H61-M LX remains identical when not adding the .config file in it. Change-Id: I2a02f32dfd9fa9c1adce3baf0d279ea19db5883f Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/asus/h61-series/Kconfig M src/mainboard/asus/h61-series/Kconfig.name M src/mainboard/asus/h61-series/acpi/superio.asl M src/mainboard/asus/h61-series/dsdt.asl R src/mainboard/asus/h61-series/variants/p8h61-m_lx/board_info.txt R src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.default R src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.layout R src/mainboard/asus/h61-series/variants/p8h61-m_lx/data.vbt R src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb R src/mainboard/asus/h61-series/variants/p8h61-m_lx/early_init.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx/gma-mainboard.ads R src/mainboard/asus/h61-series/variants/p8h61-m_lx/gpio.c R src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c D src/mainboard/asus/p8h61-m_lx/Kconfig D src/mainboard/asus/p8h61-m_lx/Kconfig.name D src/mainboard/asus/p8h61-m_lx/Makefile.inc D src/mainboard/asus/p8h61-m_lx/acpi/ec.asl D src/mainboard/asus/p8h61-m_lx/acpi/platform.asl D src/mainboard/asus/p8h61-m_lx/acpi/superio.asl D src/mainboard/asus/p8h61-m_lx/dsdt.asl D src/mainboard/asus/p8h61-m_lx/mainboard.c 21 files changed, 46 insertions(+), 114 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/54375/1 diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 212c06b..f35cdae 100644 --- a/src/mainboard/asus/h61-series/Kconfig +++ b/src/mainboard/asus/h61-series/Kconfig @@ -20,12 +20,14 @@ config VARIANT_DIR string default "h61m-cs" if BOARD_ASUS_H61M_CS + default "p8h61-m_lx" if BOARD_ASUS_P8H61_M_LX 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 LX" if BOARD_ASUS_P8H61_M_LX default "P8H61-M LX3 R2.0" if BOARD_ASUS_P8H61_M_LX3_R2_0 default "P8H61-M PRO" if BOARD_ASUS_P8H61_M_PRO @@ -39,4 +41,14 @@ config CMOS_LAYOUT_FILE default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/cmos.layout" +# +# These ME partitions need to be whitelisted for correct system +# operation. Example issues from removing them include: no serial output +# and kernel warnings about loading audio codecs. +# +config ME_CLEANER_ARGS + string + depends on USE_ME_CLEANER + default "-S --whitelist EFFS,FCRS" + endif diff --git a/src/mainboard/asus/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name index 6bb8d45..c531188 100644 --- a/src/mainboard/asus/h61-series/Kconfig.name +++ b/src/mainboard/asus/h61-series/Kconfig.name @@ -8,6 +8,18 @@ select NO_UART_ON_SUPERIO select SUPERIO_NUVOTON_NCT6779D +config BOARD_ASUS_P8H61_M_LX + bool "P8H61-M LX" + select BOARD_ASUS_H61_SERIES + select BOARD_ROMSIZE_KB_4096 + select HAVE_CMOS_DEFAULT + select HAVE_OPTION_TABLE + select INTEL_INT15 + select REALTEK_8168_RESET + select RT8168_SET_LED_MODE + select SUPERIO_NUVOTON_COMMON_COM_A + select SUPERIO_NUVOTON_NCT6776 + 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/h61-series/acpi/superio.asl b/src/mainboard/asus/h61-series/acpi/superio.asl index ee2eabe..5581626 100644 --- a/src/mainboard/asus/h61-series/acpi/superio.asl +++ b/src/mainboard/asus/h61-series/acpi/superio.asl @@ -1,3 +1,18 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#if CONFIG(BOARD_ASUS_P8H61_M_LX) + +#define SUPERIO_DEV SIO0 +#define SUPERIO_PNP_BASE 0x2e +#define NCT6776_SHOW_PP +#define NCT6776_SHOW_SP1 +#define NCT6776_SHOW_KBC +#define NCT6776_SHOW_HWM + +#undef NCT6776_SHOW_GPIO + +#include <superio/nuvoton/nct6776/acpi/superio.asl> + +#else /* !BOARD_ASUS_P8H61_M_LX */ #include <drivers/pc80/pc/ps2_controller.asl> +#endif diff --git a/src/mainboard/asus/h61-series/dsdt.asl b/src/mainboard/asus/h61-series/dsdt.asl index e8e2b3a..539922e 100644 --- a/src/mainboard/asus/h61-series/dsdt.asl +++ b/src/mainboard/asus/h61-series/dsdt.asl @@ -2,13 +2,19 @@ #include <acpi/acpi.h> +#if CONFIG(BOARD_ASUS_P8H61_M_LX) +#define BOARD_DSDT_REVISION 0x20171231 /* OEM revision */ +#else +#define BOARD_DSDT_REVISION 0x20141018 +#endif + DefinitionBlock( "dsdt.aml", "DSDT", ACPI_DSDT_REV_2, OEM_ID, ACPI_TABLE_CREATOR, - 0x20141018 /* OEM revision */ + BOARD_DSDT_REVISION ) { #include <acpi/dsdt_top.asl> diff --git a/src/mainboard/asus/p8h61-m_lx/board_info.txt b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/board_info.txt similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/board_info.txt rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/board_info.txt diff --git a/src/mainboard/asus/p8h61-m_lx/cmos.default b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.default similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/cmos.default rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.default diff --git a/src/mainboard/asus/p8h61-m_lx/cmos.layout b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.layout similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/cmos.layout rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/cmos.layout diff --git a/src/mainboard/asus/p8h61-m_lx/data.vbt b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/data.vbt similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/data.vbt rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/data.vbt Binary files differ diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/devicetree.cb rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb diff --git a/src/mainboard/asus/p8h61-m_lx/early_init.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/early_init.c similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/early_init.c rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/early_init.c diff --git a/src/mainboard/asus/p8h61-m_lx/gma-mainboard.ads b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/gma-mainboard.ads similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/gma-mainboard.ads rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/gma-mainboard.ads diff --git a/src/mainboard/asus/p8h61-m_lx/gpio.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/gpio.c similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/gpio.c rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/gpio.c diff --git a/src/mainboard/asus/p8h61-m_lx/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c similarity index 100% rename from src/mainboard/asus/p8h61-m_lx/hda_verb.c rename to src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig deleted file mode 100644 index 8015997..0000000 --- a/src/mainboard/asus/p8h61-m_lx/Kconfig +++ /dev/null @@ -1,42 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -if BOARD_ASUS_P8H61_M_LX - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_4096 - 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 NORTHBRIDGE_INTEL_SANDYBRIDGE - select REALTEK_8168_RESET - select RT8168_SET_LED_MODE - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_BD82X6X - select SUPERIO_NUVOTON_COMMON_COM_A - select SUPERIO_NUVOTON_NCT6776 - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "asus/p8h61-m_lx" - -config MAINBOARD_PART_NUMBER - string - default "P8H61-M LX" - -# -# These ME partitions need to be whitelisted for correct system -# operation. Example issues from removing them include: no serial output -# and kernel warnings about loading audio codecs. -# -config ME_CLEANER_ARGS - string - depends on USE_ME_CLEANER - default "-S --whitelist EFFS,FCRS" - -endif diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig.name b/src/mainboard/asus/p8h61-m_lx/Kconfig.name deleted file mode 100644 index d62f437..0000000 --- a/src/mainboard/asus/p8h61-m_lx/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_P8H61_M_LX - bool "P8H61-M LX" diff --git a/src/mainboard/asus/p8h61-m_lx/Makefile.inc b/src/mainboard/asus/p8h61-m_lx/Makefile.inc deleted file mode 100644 index e09d538..0000000 --- a/src/mainboard/asus/p8h61-m_lx/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -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/p8h61-m_lx/acpi/ec.asl b/src/mainboard/asus/p8h61-m_lx/acpi/ec.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/asus/p8h61-m_lx/acpi/ec.asl +++ /dev/null diff --git a/src/mainboard/asus/p8h61-m_lx/acpi/platform.asl b/src/mainboard/asus/p8h61-m_lx/acpi/platform.asl deleted file mode 100644 index 90cf05b..0000000 --- a/src/mainboard/asus/p8h61-m_lx/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/p8h61-m_lx/acpi/superio.asl b/src/mainboard/asus/p8h61-m_lx/acpi/superio.asl deleted file mode 100644 index 4bdb4b9..0000000 --- a/src/mainboard/asus/p8h61-m_lx/acpi/superio.asl +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#define SUPERIO_DEV SIO0 -#define SUPERIO_PNP_BASE 0x2e -#define NCT6776_SHOW_PP -#define NCT6776_SHOW_SP1 -#define NCT6776_SHOW_KBC -#define NCT6776_SHOW_HWM - -#undef NCT6776_SHOW_GPIO - -#include <superio/nuvoton/nct6776/acpi/superio.asl> diff --git a/src/mainboard/asus/p8h61-m_lx/dsdt.asl b/src/mainboard/asus/p8h61-m_lx/dsdt.asl deleted file mode 100644 index dc53527..0000000 --- a/src/mainboard/asus/p8h61-m_lx/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, - 0x20171231 /* 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> - #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> - } -} diff --git a/src/mainboard/asus/p8h61-m_lx/mainboard.c b/src/mainboard/asus/p8h61-m_lx/mainboard.c deleted file mode 100644 index f0dbc3f..0000000 --- a/src/mainboard/asus/p8h61-m_lx/mainboard.c +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <device/device.h> -#include <drivers/intel/gma/int15.h> - -static void mainboard_enable(struct device *dev) -{ - install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_NONE, - GMA_INT15_PANEL_FIT_DEFAULT, - GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; -- To view, visit https://review.coreboot.org/c/coreboot/+/54375 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2a02f32dfd9fa9c1adce3baf0d279ea19db5883f Gerrit-Change-Number: 54375 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-Attention: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/asus/h61m-cs: Transform into variant setup
by Angel Pons (Code Review) 17 May '21

17 May '21

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(a)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> - } -} -- To view, visit https://review.coreboot.org/c/coreboot/+/54374 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1ffb41470d24713a4a7f0689958b733d4b1bdf52 Gerrit-Change-Number: 54374 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/asus/p8h61-m_pro: Transform into variant setup
by Angel Pons (Code Review) 17 May '21

17 May '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54373 ) Change subject: mb/asus/p8h61-m_pro: Transform into variant setup ...................................................................... mb/asus/p8h61-m_pro: Transform into variant setup Tested with BUILD_TIMELESS=1, coreboot.rom for the Asus P8H61-M PRO remains identical when not adding the .config file in it. Change-Id: Iaa53a8a1b75f4c7359e32c6cd8c8a488c5763bbe Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/asus/h61-series/Kconfig M src/mainboard/asus/h61-series/Kconfig.name R src/mainboard/asus/h61-series/variants/p8h61-m_pro/board_info.txt R src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.default R src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.layout R src/mainboard/asus/h61-series/variants/p8h61-m_pro/data.vbt R src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb R src/mainboard/asus/h61-series/variants/p8h61-m_pro/early_init.c R src/mainboard/asus/h61-series/variants/p8h61-m_pro/gma-mainboard.ads R src/mainboard/asus/h61-series/variants/p8h61-m_pro/gpio.c R src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c D src/mainboard/asus/p8h61-m_pro/Kconfig D src/mainboard/asus/p8h61-m_pro/Kconfig.name D src/mainboard/asus/p8h61-m_pro/Makefile.inc D src/mainboard/asus/p8h61-m_pro/acpi/ec.asl D src/mainboard/asus/p8h61-m_pro/acpi/platform.asl D src/mainboard/asus/p8h61-m_pro/acpi/superio.asl D src/mainboard/asus/p8h61-m_pro/dsdt.asl 18 files changed, 20 insertions(+), 86 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/54373/1 diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 2ef6642..959580f 100644 --- a/src/mainboard/asus/h61-series/Kconfig +++ b/src/mainboard/asus/h61-series/Kconfig @@ -20,13 +20,21 @@ config VARIANT_DIR string 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 "P8H61-M LX3 R2.0" if BOARD_ASUS_P8H61_M_LX3_R2_0 + default "P8H61-M PRO" if BOARD_ASUS_P8H61_M_PRO 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/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name index 14ca540..d876aea 100644 --- a/src/mainboard/asus/h61-series/Kconfig.name +++ b/src/mainboard/asus/h61-series/Kconfig.name @@ -6,3 +6,15 @@ select REALTEK_8168_RESET select RT8168_SET_LED_MODE select SUPERIO_NUVOTON_NCT6779D + +config BOARD_ASUS_P8H61_M_PRO + bool "P8H61-M PRO" + select BOARD_ASUS_H61_SERIES + select BOARD_ROMSIZE_KB_4096 + select DRIVERS_ASMEDIA_ASPM_BLACKLIST + select HAVE_CMOS_DEFAULT + select HAVE_OPTION_TABLE + select MAINBOARD_HAS_LPC_TPM + select REALTEK_8168_RESET + select RT8168_SET_LED_MODE + select SUPERIO_NUVOTON_NCT6776 diff --git a/src/mainboard/asus/p8h61-m_pro/board_info.txt b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/board_info.txt similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/board_info.txt rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/board_info.txt diff --git a/src/mainboard/asus/p8h61-m_pro/cmos.default b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.default similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/cmos.default rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.default diff --git a/src/mainboard/asus/p8h61-m_pro/cmos.layout b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.layout similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/cmos.layout rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/cmos.layout diff --git a/src/mainboard/asus/p8h61-m_pro/data.vbt b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/data.vbt similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/data.vbt rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/data.vbt Binary files differ diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/devicetree.cb rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb diff --git a/src/mainboard/asus/p8h61-m_pro/early_init.c b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/early_init.c similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/early_init.c rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/early_init.c diff --git a/src/mainboard/asus/p8h61-m_pro/gma-mainboard.ads b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/gma-mainboard.ads similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/gma-mainboard.ads rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/gma-mainboard.ads diff --git a/src/mainboard/asus/p8h61-m_pro/gpio.c b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/gpio.c similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/gpio.c rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/gpio.c diff --git a/src/mainboard/asus/p8h61-m_pro/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c similarity index 100% rename from src/mainboard/asus/p8h61-m_pro/hda_verb.c rename to src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig deleted file mode 100644 index 5674549..0000000 --- a/src/mainboard/asus/p8h61-m_pro/Kconfig +++ /dev/null @@ -1,32 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -if BOARD_ASUS_P8H61_M_PRO - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_4096 - select DRIVERS_ASMEDIA_ASPM_BLACKLIST - 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 MAINBOARD_HAS_LPC_TPM - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select REALTEK_8168_RESET - select RT8168_SET_LED_MODE - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_BD82X6X - select SUPERIO_NUVOTON_NCT6776 - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "asus/p8h61-m_pro" - -config MAINBOARD_PART_NUMBER - string - default "P8H61-M PRO" - -endif # BOARD_ASUS_P8H61_M_PRO diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig.name b/src/mainboard/asus/p8h61-m_pro/Kconfig.name deleted file mode 100644 index a19d4e5..0000000 --- a/src/mainboard/asus/p8h61-m_pro/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_P8H61_M_PRO - bool "P8H61-M PRO" diff --git a/src/mainboard/asus/p8h61-m_pro/Makefile.inc b/src/mainboard/asus/p8h61-m_pro/Makefile.inc deleted file mode 100644 index e402ffa..0000000 --- a/src/mainboard/asus/p8h61-m_pro/Makefile.inc +++ /dev/null @@ -1,6 +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/p8h61-m_pro/acpi/ec.asl b/src/mainboard/asus/p8h61-m_pro/acpi/ec.asl deleted file mode 100644 index e69de29..0000000 --- a/src/mainboard/asus/p8h61-m_pro/acpi/ec.asl +++ /dev/null diff --git a/src/mainboard/asus/p8h61-m_pro/acpi/platform.asl b/src/mainboard/asus/p8h61-m_pro/acpi/platform.asl deleted file mode 100644 index bbee0a2..0000000 --- a/src/mainboard/asus/p8h61-m_pro/acpi/platform.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* The _PTS method (Prepare To Sleep) is called before the OS is - * entering a sleep state. The sleep state number is passed in Arg0 - */ - -Method(_PTS,1) -{ -} - -/* The _WAK method is called on system wakeup */ - -Method(_WAK,1) -{ - Return(Package(){0,0}) -} diff --git a/src/mainboard/asus/p8h61-m_pro/acpi/superio.asl b/src/mainboard/asus/p8h61-m_pro/acpi/superio.asl deleted file mode 100644 index ee2eabe..0000000 --- a/src/mainboard/asus/p8h61-m_pro/acpi/superio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <drivers/pc80/pc/ps2_controller.asl> diff --git a/src/mainboard/asus/p8h61-m_pro/dsdt.asl b/src/mainboard/asus/p8h61-m_pro/dsdt.asl deleted file mode 100644 index 149d548..0000000 --- a/src/mainboard/asus/p8h61-m_pro/dsdt.asl +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#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> - } -} -- To view, visit https://review.coreboot.org/c/coreboot/+/54373 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iaa53a8a1b75f4c7359e32c6cd8c8a488c5763bbe Gerrit-Change-Number: 54373 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2021