From 5f7910d220572f879b218de1bcb9dc9cd112d521 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sun, 14 Oct 2018 13:12:01 +0200 Subject: mb/asus/p5q_pro: Add mainboard This mainboard is quite similar to the p5qc. The main differences being a second PEG slot, the IDE slot and being DDR2 only. The following was tested: - both PEG slots populated (coreboot sets legacy VGA decoding on the GPU in the black slot) - USB - Ethernet NIC - PS2 Keyboard - COM1 - S3 resume Change-Id: I49a4bca4256e2a905aff3252eca76387c81152c1 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/29102 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/asus/p5qc/Kconfig | 15 ++- src/mainboard/asus/p5qc/Kconfig.name | 3 + src/mainboard/asus/p5qc/devicetree.cb | 124 -------------------- .../asus/p5qc/variants/p5q_pro/devicetree.cb | 127 +++++++++++++++++++++ .../asus/p5qc/variants/p5qc/devicetree.cb | 124 ++++++++++++++++++++ 5 files changed, 267 insertions(+), 126 deletions(-) delete mode 100644 src/mainboard/asus/p5qc/devicetree.cb create mode 100644 src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb create mode 100644 src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig index cf71b641cc..2bcee16c9a 100644 --- a/src/mainboard/asus/p5qc/Kconfig +++ b/src/mainboard/asus/p5qc/Kconfig @@ -14,7 +14,7 @@ # GNU General Public License for more details. # -if BOARD_ASUS_P5QC +if BOARD_ASUS_P5QC || BOARD_ASUS_P5Q_PRO config BOARD_SPECIFIC_OPTIONS def_bool y @@ -34,9 +34,20 @@ config MAINBOARD_DIR string default "asus/p5qc" +config VARIANT_DIR + string + default "p5qc" if BOARD_ASUS_P5QC + default "p5q_pro" if BOARD_ASUS_P5Q_PRO + config MAINBOARD_PART_NUMBER string - default "P5QC" + default "P5QC" if BOARD_ASUS_P5QC + default "P5Q-PRO" if BOARD_ASUS_P5Q_PRO + +config DEVICETREE + string + default "variants/p5qc/devicetree.cb" if BOARD_ASUS_P5QC + default "variants/p5q_pro/devicetree.cb" if BOARD_ASUS_P5Q_PRO config MAX_CPUS int diff --git a/src/mainboard/asus/p5qc/Kconfig.name b/src/mainboard/asus/p5qc/Kconfig.name index d764867665..a4c6e4892c 100644 --- a/src/mainboard/asus/p5qc/Kconfig.name +++ b/src/mainboard/asus/p5qc/Kconfig.name @@ -1,2 +1,5 @@ config BOARD_ASUS_P5QC bool "P5QC" + +config BOARD_ASUS_P5Q_PRO + bool "P5Q PRO" diff --git a/src/mainboard/asus/p5qc/devicetree.cb b/src/mainboard/asus/p5qc/devicetree.cb deleted file mode 100644 index 52bbb40feb..0000000000 --- a/src/mainboard/asus/p5qc/devicetree.cb +++ /dev/null @@ -1,124 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2015 Damien Zammit -# Copyright (C) 2018 Arthur Heymans -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# - -chip northbridge/intel/x4x # Northbridge - device cpu_cluster 0 on # APIC cluster - chip cpu/intel/socket_LGA775 - device lapic 0 on end - end - chip cpu/intel/model_1067x # CPU - device lapic 0xACAC off end - end - end - device domain 0 on # PCI domain - device pci 0.0 on end # Host Bridge - device pci 1.0 on end # PEG - device pci 2.0 off end # Integrated graphics controller - device pci 2.1 off end # Integrated graphics controller 2 - device pci 3.0 off end # ME - device pci 3.1 off end # ME - device pci 3.2 off end # ME - device pci 3.3 off end # ME - device pci 6.0 off end # PEG 2 - chip southbridge/intel/i82801jx # Southbridge - register "gpe0_en" = "0x40" - - # Set AHCI mode. - register "sata_port_map" = "0x3f" - register "sata_clock_request" = "0" - register "sata_traffic_monitor" = "0" - - # Enable PCIe ports 0,2,3 as slots. - register "pcie_slot_implemented" = "0x31" - - device pci 19.0 off end # GBE - device pci 1a.0 on end # USB - device pci 1a.1 on end # USB - device pci 1a.2 on end # USB - device pci 1a.7 on end # USB - device pci 1b.0 on end # Audio - device pci 1c.0 on end # PCIe 1 - device pci 1c.1 off end # PCIe 2 - device pci 1c.2 off end # PCIe 3 - device pci 1c.3 off end # PCIe 4 - device pci 1c.4 on end # PCIe 5 MARVEL IDE - device pci 1c.5 on end # PCIe 6 - device pci 1d.0 on end # USB - device pci 1d.1 on end # USB - device pci 1d.2 on end # USB - device pci 1d.7 on end # USB - device pci 1e.0 on end # PCI bridge - device pci 1f.0 on # LPC bridge - chip superio/winbond/w83667hg-a # Super I/O - device pnp 2e.0 off end # FDC - device pnp 2e.1 off end # LPT1 - device pnp 2e.2 on # COM1 - # Global registers - irq 0x2a = 0x00 - irq 0x2c = 0x22 - irq 0x2d = 0x00 - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.3 off end # COM2 - device pnp 2e.5 on # PS/2 keyboard & mouse - io 0x60 = 0x60 - io 0x62 = 0x64 - irq 0x70 = 1 - irq 0x72 = 12 - end - device pnp 2e.106 off end # SPI1 - device pnp 2e.107 off end # GIPO6 - device pnp 2e.207 off end # GIPO7 - device pnp 2e.307 on # GIPO8 - irq 0xe4 = 0xfb - irq 0xe5 = 0x02 - end - device pnp 2e.407 off end # GIPO9 - device pnp 2e.8 off end # WDT - device pnp 2e.108 off end # GPIO 1 - device pnp 2e.9 off end # GPIO2 - device pnp 2e.109 on end # GPIO3 - device pnp 2e.209 on # GPIO4 - irq 0xf0 = 0x7f - irq 0xfe = 0x07 - end - device pnp 2e.309 on end # GPIO5 - device pnp 2e.a on # ACPI - irq 0xe4 = 0x10 # 3VSBSW# enable - irq 0xe5 = 0x02 - irq 0xf2 = 0xfc - end - device pnp 2e.b on # HW Monitor - io 0x60 = 0x290 - irq 0x70 = 0 - # IRQ purposefully not assigned to prevent lockups - end - device pnp 2e.c on end # PECI - device pnp 2e.d on end # VID_BUSSEL - device pnp 2e.f on end # GPIO_PP_OD - end - end - device pci 1f.1 off end # PATA/IDE - device pci 1f.2 on end # SATA - device pci 1f.3 on end # SMbus - device pci 1f.4 off end - device pci 1f.5 off end # IDE - device pci 1f.6 off end - end - end -end diff --git a/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb new file mode 100644 index 0000000000..f7088fc99c --- /dev/null +++ b/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb @@ -0,0 +1,127 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2015 Damien Zammit +# Copyright (C) 2018 Arthur Heymans +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +chip northbridge/intel/x4x # Northbridge + device cpu_cluster 0 on # APIC cluster + chip cpu/intel/socket_LGA775 + device lapic 0 on end + end + chip cpu/intel/model_1067x # CPU + device lapic 0xACAC off end + end + end + device domain 0 on # PCI domain + device pci 0.0 on end # Host Bridge + device pci 1.0 on end # PEG + device pci 2.0 off end # Integrated graphics controller + device pci 2.1 off end # Integrated graphics controller 2 + device pci 3.0 off end # ME + device pci 3.1 off end # ME + device pci 3.2 off end # ME + device pci 3.3 off end # ME + device pci 6.0 on end # PEG 2 + chip southbridge/intel/i82801jx # Southbridge + register "gpe0_en" = "0x40" + + # Set AHCI mode. + register "sata_port_map" = "0x3f" + register "sata_clock_request" = "0" + register "sata_traffic_monitor" = "0" + + # Enable PCIe ports 0,2,3 as slots. + register "pcie_slot_implemented" = "0x31" + + device pci 19.0 off end # GBE + device pci 1a.0 on end # USB + device pci 1a.1 on end # USB + device pci 1a.2 on end # USB + device pci 1a.7 on end # USB + device pci 1b.0 on end # Audio + device pci 1c.0 on end # PCIe 1 + device pci 1c.1 off end # PCIe 2 + device pci 1c.2 off end # PCIe 3 + device pci 1c.3 off end # PCIe 4 + device pci 1c.4 on end # PCIe 5 MARVEL IDE + device pci 1c.5 on end # PCIe 6 + device pci 1d.0 on end # USB + device pci 1d.1 on end # USB + device pci 1d.2 on end # USB + device pci 1d.7 on end # USB + device pci 1e.0 on end # PCI bridge + device pci 1f.0 on # LPC bridge + chip superio/winbond/w83667hg-a # Super I/O + device pnp 2e.0 on # FDC + # Global registers + irq 0x2a = 0x30 + irq 0x2c = 0x22 + irq 0x2d = 0x00 + io 0x60 = 0x3f0 + irq 0x70 = 0x06 + end + device pnp 2e.1 off end # LPT1 + device pnp 2e.2 on # COM1 + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.3 off end # COM2 + device pnp 2e.5 on # PS/2 keyboard & mouse + io 0x60 = 0x60 + io 0x62 = 0x64 + irq 0x70 = 1 + irq 0x72 = 12 + end + device pnp 2e.106 off end # SPI1 + device pnp 2e.107 off end # GIPO6 + device pnp 2e.207 off end # GIPO7 + device pnp 2e.307 on # GIPO8 + irq 0xe4 = 0xfb + irq 0xe5 = 0x82 + end + device pnp 2e.407 off end # GIPO9 + device pnp 2e.8 off end # WDT + device pnp 2e.108 off end # GPIO 1 + device pnp 2e.9 off end # GPIO2 + device pnp 2e.109 on end # GPIO3 + device pnp 2e.209 on # GPIO4 + irq 0xf0 = 0xff + irq 0xfe = 0x07 + end + device pnp 2e.309 on end # GPIO5 + device pnp 2e.a on # ACPI + irq 0xe4 = 0x10 # 3VSBSW# enable + irq 0xe5 = 0x02 + irq 0xf2 = 0xfc + end + device pnp 2e.b on # HW Monitor + io 0x60 = 0x290 + irq 0x70 = 0x0 + # IRQ purposefully not assigned to prevent lockups + end + device pnp 2e.c on end # PECI + device pnp 2e.d on end # VID_BUSSEL + device pnp 2e.f on end # GPIO_PP_OD + end + end + device pci 1f.1 off end # PATA/IDE + device pci 1f.2 on end # SATA + device pci 1f.3 on end # SMbus + device pci 1f.4 off end + device pci 1f.5 on end # IDE + device pci 1f.6 off end + end + end +end diff --git a/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb new file mode 100644 index 0000000000..52bbb40feb --- /dev/null +++ b/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb @@ -0,0 +1,124 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2015 Damien Zammit +# Copyright (C) 2018 Arthur Heymans +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +chip northbridge/intel/x4x # Northbridge + device cpu_cluster 0 on # APIC cluster + chip cpu/intel/socket_LGA775 + device lapic 0 on end + end + chip cpu/intel/model_1067x # CPU + device lapic 0xACAC off end + end + end + device domain 0 on # PCI domain + device pci 0.0 on end # Host Bridge + device pci 1.0 on end # PEG + device pci 2.0 off end # Integrated graphics controller + device pci 2.1 off end # Integrated graphics controller 2 + device pci 3.0 off end # ME + device pci 3.1 off end # ME + device pci 3.2 off end # ME + device pci 3.3 off end # ME + device pci 6.0 off end # PEG 2 + chip southbridge/intel/i82801jx # Southbridge + register "gpe0_en" = "0x40" + + # Set AHCI mode. + register "sata_port_map" = "0x3f" + register "sata_clock_request" = "0" + register "sata_traffic_monitor" = "0" + + # Enable PCIe ports 0,2,3 as slots. + register "pcie_slot_implemented" = "0x31" + + device pci 19.0 off end # GBE + device pci 1a.0 on end # USB + device pci 1a.1 on end # USB + device pci 1a.2 on end # USB + device pci 1a.7 on end # USB + device pci 1b.0 on end # Audio + device pci 1c.0 on end # PCIe 1 + device pci 1c.1 off end # PCIe 2 + device pci 1c.2 off end # PCIe 3 + device pci 1c.3 off end # PCIe 4 + device pci 1c.4 on end # PCIe 5 MARVEL IDE + device pci 1c.5 on end # PCIe 6 + device pci 1d.0 on end # USB + device pci 1d.1 on end # USB + device pci 1d.2 on end # USB + device pci 1d.7 on end # USB + device pci 1e.0 on end # PCI bridge + device pci 1f.0 on # LPC bridge + chip superio/winbond/w83667hg-a # Super I/O + device pnp 2e.0 off end # FDC + device pnp 2e.1 off end # LPT1 + device pnp 2e.2 on # COM1 + # Global registers + irq 0x2a = 0x00 + irq 0x2c = 0x22 + irq 0x2d = 0x00 + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.3 off end # COM2 + device pnp 2e.5 on # PS/2 keyboard & mouse + io 0x60 = 0x60 + io 0x62 = 0x64 + irq 0x70 = 1 + irq 0x72 = 12 + end + device pnp 2e.106 off end # SPI1 + device pnp 2e.107 off end # GIPO6 + device pnp 2e.207 off end # GIPO7 + device pnp 2e.307 on # GIPO8 + irq 0xe4 = 0xfb + irq 0xe5 = 0x02 + end + device pnp 2e.407 off end # GIPO9 + device pnp 2e.8 off end # WDT + device pnp 2e.108 off end # GPIO 1 + device pnp 2e.9 off end # GPIO2 + device pnp 2e.109 on end # GPIO3 + device pnp 2e.209 on # GPIO4 + irq 0xf0 = 0x7f + irq 0xfe = 0x07 + end + device pnp 2e.309 on end # GPIO5 + device pnp 2e.a on # ACPI + irq 0xe4 = 0x10 # 3VSBSW# enable + irq 0xe5 = 0x02 + irq 0xf2 = 0xfc + end + device pnp 2e.b on # HW Monitor + io 0x60 = 0x290 + irq 0x70 = 0 + # IRQ purposefully not assigned to prevent lockups + end + device pnp 2e.c on end # PECI + device pnp 2e.d on end # VID_BUSSEL + device pnp 2e.f on end # GPIO_PP_OD + end + end + device pci 1f.1 off end # PATA/IDE + device pci 1f.2 on end # SATA + device pci 1f.3 on end # SMbus + device pci 1f.4 off end + device pci 1f.5 off end # IDE + device pci 1f.6 off end + end + end +end -- cgit v1.2.3