From 901354b9f0bd9234e092891b8854abd20de48714 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 17 May 2021 16:12:17 +0200 Subject: mb/asus/p8h61-m_pro: Switch to overridetree 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: I443d3823e32a246a89ff12e52a0301b2c252e23b Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/54388 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/mainboard/asus/h61-series/Kconfig | 4 +- .../h61-series/variants/p8h61-m_pro/devicetree.cb | 110 --------------------- .../variants/p8h61-m_pro/overridetree.cb | 81 +++++++++++++++ 3 files changed, 83 insertions(+), 112 deletions(-) delete mode 100644 src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb create mode 100644 src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 21975cf273..4b656545c7 100644 --- a/src/mainboard/asus/h61-series/Kconfig +++ b/src/mainboard/asus/h61-series/Kconfig @@ -33,14 +33,14 @@ config MAINBOARD_PART_NUMBER default "P8H61-M PRO" if BOARD_ASUS_P8H61_M_PRO # TODO: remove once all boards use overridetrees -if BOARD_ASUS_P8H61_M_LX3_R2_0 +if BOARD_ASUS_P8H61_M_LX3_R2_0 || BOARD_ASUS_P8H61_M_PRO config OVERRIDE_DEVICETREE string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" endif -if !BOARD_ASUS_P8H61_M_LX3_R2_0 +if !BOARD_ASUS_P8H61_M_LX3_R2_0 && !BOARD_ASUS_P8H61_M_PRO config DEVICETREE string 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 deleted file mode 100644 index b1292e7059..0000000000 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/devicetree.cb +++ /dev/null @@ -1,110 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -chip northbridge/intel/sandybridge - device cpu_cluster 0 on - chip cpu/intel/model_206ax - register "acpi_c1" = "1" - register "acpi_c2" = "3" - register "acpi_c3" = "5" - device lapic 0 on end - device lapic 0xacac off end - end - end - device domain 0 on - device pci 00.0 on end # Host bridge - device pci 01.0 on end # PCIe bridge for discrete graphics (PCIEX16_1) - device pci 02.0 on end # Internal graphics VGA controller - - chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH - register "c2_latency" = "0x0065" - register "gen1_dec" = "0x000c0291" # HWM - register "sata_port_map" = "0x33" - register "spi_lvscc" = "0x2005" - register "spi_uvscc" = "0x2005" - - device pci 16.0 on end # Management Engine Interface 1 - device pci 16.1 off end # Management Engine Interface 2 - device pci 16.2 off end # Management Engine IDE-R - device pci 16.3 off end # Management Engine KT - device pci 19.0 off end # Intel Gigabit Ethernet - device pci 1a.0 on end # USB2 EHCI #2 - device pci 1b.0 on end # High Definition Audio Audio controller - device pci 1c.0 on end # PCIe x1 Port (PCIEX1_1) - device pci 1c.1 on end # PCIe x1 Port (PCIEX1_2) - device pci 1c.2 on # Realtek RTL8111E Ethernet Controller - chip drivers/net - register "customized_leds" = "0x00f6" - register "wake" = "9" - device pci 00.0 on end - end - end - device pci 1c.3 on end # ASMedia ASM1042 USB3 Controller - device pci 1c.4 on end # PCIe x1 Port, x16 size (PCIEX16_2) - device pci 1c.5 on end # ASMedia ASM1062 SATA Controller - device pci 1c.6 off end # Unused PCIe Port - device pci 1c.7 off end # Unused PCIe Port - device pci 1d.0 on end # USB2 EHCI #1 - device pci 1e.0 off end # PCI bridge - device pci 1f.0 on # LPC bridge - chip superio/nuvoton/nct6776 - device pnp 2e.0 off end # Floppy - device pnp 2e.1 on # Parallel port - io 0x60 = 0x378 - irq 0x70 = 5 - drq 0x74 = 4 - irq 0xf0 = 0x3c - end - device pnp 2e.2 on # COM1 - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.3 off end # COM2, IR - device pnp 2e.5 on # Keyboard - io 0x60 = 0x60 - io 0x62 = 0x64 - irq 0x70 = 1 - irq 0x72 = 12 - end - device pnp 2e.6 off end # CIR - device pnp 2e.7 off end # GPIO6-9 - device pnp 2e.8 off end # WDT1, GPIO0, GPIO1, GPIOA - device pnp 2e.9 off end # GPIO2-5 - device pnp 2e.a on # ACPI - irq 0xe5 = 0x06 - irq 0xe6 = 0x0c - irq 0xe7 = 0x11 - irq 0xf0 = 0x00 - irq 0xf2 = 0x5d - end - device pnp 2e.b on # HWM, LED - io 0x60 = 0x0290 - io 0x62 = 0x0000 - end - device pnp 2e.d on end # VID - device pnp 2e.e off end # CIR WAKE-UP - device pnp 2e.f on # GPIO Push-Pull or Open-drain - irq 0xf0 = 0x9d - end - device pnp 2e.14 off end # SVID - device pnp 2e.16 on # Deep Sleep - io 0x30 = 0x20 - end - device pnp 2e.17 on # GPIOA - irq 0xe0 = 0xff - irq 0xe1 = 0xff - irq 0xe2 = 0xff - irq 0xe3 = 0xff - irq 0xe5 = 0xff - end - end - chip drivers/pc80/tpm - device pnp 4e.0 on end # TPM - end - end - device pci 1f.2 on end # SATA Controller 1 - device pci 1f.3 on end # SMBus - device pci 1f.5 off end # SATA Controller 2 - device pci 1f.6 off end # Thermal - end - end -end diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb new file mode 100644 index 0000000000..d726131d63 --- /dev/null +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb @@ -0,0 +1,81 @@ +## SPDX-License-Identifier: GPL-2.0-or-later + +chip northbridge/intel/sandybridge + device domain 0 on + chip southbridge/intel/bd82x6x + register "gen1_dec" = "0x000c0291" # HWM + + device pci 1c.0 on end # PCIe x1 Port (PCIEX1_1) + device pci 1c.1 on end # PCIe x1 Port (PCIEX1_2) + device pci 1c.2 on # Realtek RTL8111E Ethernet Controller + chip drivers/net + register "customized_leds" = "0x00f6" + register "wake" = "9" + device pci 00.0 on end + end + end + device pci 1c.3 on end # ASMedia ASM1042 USB3 Controller + device pci 1c.4 on end # PCIe x1 Port, x16 size (PCIEX16_2) + device pci 1c.5 on end # ASMedia ASM1062 SATA Controller + device pci 1c.6 off end # Unused PCIe Port + device pci 1c.7 off end # Unused PCIe Port + + device pci 1f.0 on # LPC bridge + chip superio/nuvoton/nct6776 + device pnp 2e.0 off end # Floppy + device pnp 2e.1 on # Parallel port + io 0x60 = 0x378 + irq 0x70 = 5 + drq 0x74 = 4 + irq 0xf0 = 0x3c + end + device pnp 2e.2 on # COM1 + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.3 off end # COM2, IR + device pnp 2e.5 on # Keyboard + io 0x60 = 0x60 + io 0x62 = 0x64 + irq 0x70 = 1 + irq 0x72 = 12 + end + device pnp 2e.6 off end # CIR + device pnp 2e.7 off end # GPIO6-9 + device pnp 2e.8 off end # WDT1, GPIO0, GPIO1, GPIOA + device pnp 2e.9 off end # GPIO2-5 + device pnp 2e.a on # ACPI + irq 0xe5 = 0x06 + irq 0xe6 = 0x0c + irq 0xe7 = 0x11 + irq 0xf0 = 0x00 + irq 0xf2 = 0x5d + end + device pnp 2e.b on # HWM, LED + io 0x60 = 0x0290 + io 0x62 = 0x0000 + end + device pnp 2e.d on end # VID + device pnp 2e.e off end # CIR WAKE-UP + device pnp 2e.f on # GPIO Push-Pull or Open-drain + irq 0xf0 = 0x9d + end + device pnp 2e.14 off end # SVID + device pnp 2e.16 on # Deep Sleep + io 0x30 = 0x20 + end + device pnp 2e.17 on # GPIOA + irq 0xe0 = 0xff + irq 0xe1 = 0xff + irq 0xe2 = 0xff + irq 0xe3 = 0xff + irq 0xe5 = 0xff + end + end + chip drivers/pc80/tpm + device pnp 4e.0 on end # TPM + end + end + end + end +end -- cgit v1.2.3