GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/asus/p8h61-m_lx: Switch to overridetree setup 

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: I3142773e8c8f11f27f7926933097ffde8ba241e2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54390
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-05-17 16:24:31 +02:00 committed by Patrick Georgi
parent 741856f7c8
commit ee5b24d232
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainboard/asus/h61-series/Kconfig
View File

@ -32,22 +32,10 @@ config MAINBOARD_PART_NUMBER
default "P8H61-M LX3 R2.0" if BOARD_ASUS_P8H61_M_LX3_R2_0 default "P8H61-M LX3 R2.0" if BOARD_ASUS_P8H61_M_LX3_R2_0
default "P8H61-M PRO" if BOARD_ASUS_P8H61_M_PRO default "P8H61-M PRO" if BOARD_ASUS_P8H61_M_PRO
# TODO: remove once all boards use overridetrees
if !BOARD_ASUS_P8H61_M_LX
config OVERRIDE_DEVICETREE config OVERRIDE_DEVICETREE
string string
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
endif
if BOARD_ASUS_P8H61_M_LX
config DEVICETREE
string
default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
endif
config CMOS_DEFAULT_FILE config CMOS_DEFAULT_FILE
default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/cmos.default" default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(CONFIG_VARIANT_DIR)/cmos.default"

32
src/mainboard/asus/h61-series/variants/p8h61-m_lx/devicetree.cb → src/mainboard/asus/h61-series/variants/p8h61-m_lx/overridetree.cb
View File

@ -1,36 +1,11 @@
## SPDX-License-Identifier: GPL-2.0-or-later ## SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/sandybridge 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 domain 0 on
subsystemid 0x1043 0x844d inherit subsystemid 0x1043 0x844d inherit
device pci 00.0 on end # Host bridge
device pci 01.0 on end # PCIe bridge for discrete graphics
device pci 02.0 on end # VGA controller
chip southbridge/intel/bd82x6x chip southbridge/intel/bd82x6x
register "c2_latency" = "0x0065"
register "gen1_dec" = "0x00000295" # Super I/O HWM register "gen1_dec" = "0x00000295" # Super I/O 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 # HD audio controller device pci 1b.0 on # HD audio controller
subsystemid 0x1043 0x8445 subsystemid 0x1043 0x8445
end end
@ -48,8 +23,7 @@ chip northbridge/intel/sandybridge
device pci 1c.5 off end # Unused PCIe port device pci 1c.5 off end # Unused PCIe port
device pci 1c.6 off end # Unused PCIe port device pci 1c.6 off end # Unused PCIe port
device pci 1c.7 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 device pci 1f.0 on # LPC bridge
chip superio/nuvoton/nct6776 chip superio/nuvoton/nct6776
device pnp 2e.0 off end # Floppy device pnp 2e.0 off end # Floppy
@ -106,10 +80,6 @@ chip northbridge/intel/sandybridge
device pnp 2e.17 off end # GPIOA device pnp 2e.17 off end # GPIOA
end end
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 end
end end