Angel Pons has uploaded this change for review.
src/mb/asrock/g41c-gs: Add variant g41m-s3
This board is pretty much like the G41M-GS, but with DDR3 memory
instead. The PCB layout is almost identical.
Currently boots but fails to light up integrated graphics with
libgfxinit. It has been compiled with a rusty GCC6 toolchain which might
be the reason for the failure. Other than that, it boots to Debian,
display lights up fine once Linux has loaded, both PS/2 work, Ethernet
works, one USB has been tested and works and NVRAM debug_level works
too.
TODO: Testing, testing and more testing...
Change-Id: I66b216af740680c390ea82e4fe07737c20227cc6
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/mainboard/asrock/g41c-gs/Kconfig
M src/mainboard/asrock/g41c-gs/Kconfig.name
M src/mainboard/asrock/g41c-gs/gpio.c
A src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
4 files changed, 156 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/28434/1
diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig
index ad2fe22..25bcd9a 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -14,7 +14,8 @@
# GNU General Public License for more details.
#
-if BOARD_ASROCK_G41C_GS_R2_0 || BOARD_ASROCK_G41C_GS || BOARD_ASROCK_G41M_GS
+if BOARD_ASROCK_G41M_GS || BOARD_ASROCK_G41M_S3 || \
+ BOARD_ASROCK_G41C_GS || BOARD_ASROCK_G41C_GS_R2_0
config BOARD_SPECIFIC_OPTIONS
def_bool y
@@ -24,7 +25,7 @@
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_NUVOTON_NCT6776 if BOARD_ASROCK_G41C_GS_R2_0
select SUPERIO_WINBOND_W83627DHG if BOARD_ASROCK_G41C_GS \
- || BOARD_ASROCK_G41M_GS
+ || BOARD_ASROCK_G41M_GS || BOARD_ASROCK_G41M_S3
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select PCIEXP_ASPM
@@ -46,12 +47,14 @@
default "G41C-GS R2.0" if BOARD_ASROCK_G41C_GS_R2_0
default "G41C-GS" if BOARD_ASROCK_G41C_GS
default "G41M-GS" if BOARD_ASROCK_G41M_GS
+ default "G41M-S3" if BOARD_ASROCK_G41M_S3
config DEVICETREE
string
default "variants/g41c-gs-r2/devicetree.cb" if BOARD_ASROCK_G41C_GS_R2_0
default "variants/g41c-gs/devicetree.cb" if BOARD_ASROCK_G41C_GS
default "variants/g41m-gs/devicetree.cb" if BOARD_ASROCK_G41M_GS
+ default "variants/g41m-s3/devicetree.cb" if BOARD_ASROCK_G41M_S3
config MAX_CPUS
int
@@ -61,4 +64,4 @@
config INTEL_GMA_VBT_FILE
default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
-endif # BOARD_ASROCK_G41C_GS_R2_0
+endif # BOARD_ASROCK_G41{M_GS, M_S3, C_GS, C_GS_R2_0}
diff --git a/src/mainboard/asrock/g41c-gs/Kconfig.name b/src/mainboard/asrock/g41c-gs/Kconfig.name
index 329a3e2..7a19988 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig.name
+++ b/src/mainboard/asrock/g41c-gs/Kconfig.name
@@ -6,3 +6,6 @@
config BOARD_ASROCK_G41M_GS
bool "G41M-GS"
+
+config BOARD_ASROCK_G41M_S3
+ bool "G41M-S3"
diff --git a/src/mainboard/asrock/g41c-gs/gpio.c b/src/mainboard/asrock/g41c-gs/gpio.c
index b6ccbad..4912899 100644
--- a/src/mainboard/asrock/g41c-gs/gpio.c
+++ b/src/mainboard/asrock/g41c-gs/gpio.c
@@ -45,7 +45,8 @@
.gpio10 = GPIO_DIR_OUTPUT,
.gpio12 = GPIO_DIR_INPUT,
.gpio13 = GPIO_DIR_INPUT,
-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)
+#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS) \
+|| IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_S3)
.gpio14 = GPIO_DIR_OUTPUT,
#else
.gpio14 = GPIO_DIR_INPUT,
@@ -56,7 +57,8 @@
.gpio20 = GPIO_DIR_OUTPUT,
.gpio24 = GPIO_DIR_OUTPUT,
.gpio25 = GPIO_DIR_OUTPUT,
-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)
+#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS) \
+|| IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_S3)
.gpio26 = GPIO_DIR_OUTPUT,
#else
.gpio26 = GPIO_DIR_INPUT,
@@ -79,7 +81,8 @@
#else /* BOARD_ASROCK_G41C_GS, BOARD_ASROCK_G41M_GS*/
static const struct pch_gpio_set1 pch_gpio_set1_level = {
.gpio10 = GPIO_LEVEL_LOW,
-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)
+#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS) \
+|| IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_S3)
.gpio14 = GPIO_LEVEL_HIGH,
#endif
.gpio15 = GPIO_LEVEL_LOW,
@@ -88,7 +91,8 @@
.gpio20 = GPIO_LEVEL_HIGH,
.gpio24 = GPIO_LEVEL_HIGH,
.gpio25 = GPIO_LEVEL_LOW,
-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)
+#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS) \
+|| IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_S3)
.gpio26 = GPIO_LEVEL_LOW,
#endif
.gpio27 = GPIO_LEVEL_LOW,
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
new file mode 100644
index 0000000..69c5864
--- /dev/null
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
@@ -0,0 +1,139 @@
+#
+# This file is part of the coreboot project.
+#
+# Copyright (C) 2017 Arthur Heymans <arthur@aheymans.xyz>
+#
+# 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
+ subsystemid 0x1458 0x5000 inherit
+ device pci 0.0 on # Host Bridge
+ subsystemid 0x1849 0x2e30
+ end
+ device pci 1.0 on end # PEG
+
+ device pci 2.0 on # Integrated graphics controller
+ subsystemid 0x1849 0x2e32
+ end
+ device pci 3.0 off end # ME
+ device pci 3.1 off end # ME
+ chip southbridge/intel/i82801gx # Southbridge
+ register "pirqa_routing" = "0x0b"
+ register "pirqb_routing" = "0x0b"
+ register "pirqc_routing" = "0x0b"
+ register "pirqd_routing" = "0x0b"
+ register "pirqe_routing" = "0x80"
+ register "pirqf_routing" = "0x80"
+ register "pirqg_routing" = "0x80"
+ register "pirqh_routing" = "0x0b"
+
+ register "ide_enable_primary" = "0x1"
+ register "sata_ahci" = "0x0" # AHCI not supported on this ICH7 variant
+ register "sata_ports_implemented" = "0x3"
+ register "gpe0_en" = "0x440"
+
+ device pci 1b.0 on # Audio
+ subsystemid 0x1849 0x3662
+ end
+ device pci 1c.0 on # PCIe 1
+ subsystemid 0x1849 0x27d0
+ end
+ device pci 1c.1 on # PCIe 2
+ subsystemid 0x1849 0x27d2
+ end
+ device pci 1c.2 off end # PCIe 3
+ device pci 1c.3 off end # PCIe 4
+ device pci 1d.0 on # USB
+ subsystemid 0x1849 0x27c8
+ end
+ device pci 1d.1 on # USB
+ subsystemid 0x1849 0x27c9
+ end
+ device pci 1d.2 on # USB
+ subsystemid 0x1849 0x27ca
+ end
+ device pci 1d.3 on # USB
+ subsystemid 0x1849 0x27cb
+ end
+ device pci 1d.7 on # USB
+ subsystemid 0x1849 0x27cc
+ end
+ device pci 1e.0 on end # PCI bridge
+ device pci 1f.0 on # LPC bridge
+ subsystemid 0x1849 0x27b8
+ chip superio/winbond/w83627dhg
+ device pnp 2e.0 off end # Floppy
+ device pnp 2e.1 on # Parallel port
+ # global
+ irq 0x28 = 0x70
+ irq 0x2c = 0xd2
+ # parallel port
+ io 0x60 = 0x378
+ irq 0x70 = 7
+ drq 0x74 = 3
+ end
+ 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 # Keyboard & MOUSE
+ io 0x60 = 0x60
+ io 0x62 = 0x64
+ irq 0x70 = 1
+ irq 0x72 = 0x0C
+ end
+ device pnp 2e.6 off end # SPI
+ device pnp 2e.7 off end # GPIO6
+ device pnp 2e.8 off end # WDT0#, PLED
+ device pnp 2e.9 on end # GPIO2
+ device pnp 2e.109 on # GPIO3
+ irq 0xfe = 0x07
+ end
+ device pnp 2e.209 on # GPIO4
+ irq 0xf4 = 0x74
+ end
+ device pnp 2e.309 off end # GPIO5
+ device pnp 2e.a on # ACPI
+ irq 0xe4 = 0x10 # Power dram during s3
+ end
+ device pnp 2e.b on # HWM, front pannel LED
+ io 0x60 = 0x290
+ irq 0x70 = 0
+ end
+ device pnp 2e.c off end # PECI, SST
+ end
+ end
+ device pci 1f.1 on # PATA/IDE
+ subsystemid 0x1849 0x27df
+ end
+ device pci 1f.2 on # SATA
+ subsystemid 0x1849 0x27c0
+ end
+ device pci 1f.3 on # SMbus
+ subsystemid 0x1849 0x27da
+ end
+ device pci 1f.4 off end
+ device pci 1f.5 off end
+ device pci 1f.6 off end
+ end
+ end
+end
To view, visit change 28434. To unsubscribe, or for help writing mail filters, visit settings.