summaryrefslogtreecommitdiff
path: root/src/mainboard/asrock/z97_extreme6
diff options
context:
space:
mode:
authorKeith Hui <buurin@gmail.com>2023-11-11 17:25:48 -0500
committerFelix Held <felix-coreboot@felixheld.de>2024-08-26 11:08:14 +0000
commitb4f47e8067a7ef55ad5e2f18058031a871edbfef (patch)
tree1a6046ce808e6a03070a66efcf125cbc74b8cb17 /src/mainboard/asrock/z97_extreme6
parente9ed7928cf31312629b30acd6a1788a64f547baf (diff)
nb/intel/haswell: Move SPD addresses to devicetree
Introduce a sandybridge-style devicetree setting for SPD addresses, and use it instead of runtime code in mb_get_spd_map() for all haswell boards without CONFIG(HAVE_SPD_IN_CBFS) - effectively all boards except google/slippy. Patch also covers recently added Z97 boards using Broadwell MRC. Also update util/autoport to match. abuild passes for all affected boards. autoport builds, but otherwise untested. Change-Id: I574aec9cb6a47c8aaf275ae06c7e1fb695534b34 Signed-off-by: Keith Hui <buurin@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79025 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/asrock/z97_extreme6')
-rw-r--r--src/mainboard/asrock/z97_extreme6/devicetree.cb1
-rw-r--r--src/mainboard/asrock/z97_extreme6/romstage.c9
2 files changed, 1 insertions, 9 deletions
diff --git a/src/mainboard/asrock/z97_extreme6/devicetree.cb b/src/mainboard/asrock/z97_extreme6/devicetree.cb
index 2258a1bfd1..dcb8123790 100644
--- a/src/mainboard/asrock/z97_extreme6/devicetree.cb
+++ b/src/mainboard/asrock/z97_extreme6/devicetree.cb
@@ -8,6 +8,7 @@ chip northbridge/intel/haswell
# This mainboard has a DP output
register "gpu_dp_c_hotplug" = "7"
+ register "spd_addresses" = "{0x50, 0x51, 0x52, 0x53}"
chip cpu/intel/haswell
device cpu_cluster 0 on ops haswell_cpu_bus_ops end
end
diff --git a/src/mainboard/asrock/z97_extreme6/romstage.c b/src/mainboard/asrock/z97_extreme6/romstage.c
index a344dee1a5..35aece908f 100644
--- a/src/mainboard/asrock/z97_extreme6/romstage.c
+++ b/src/mainboard/asrock/z97_extreme6/romstage.c
@@ -1,21 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <northbridge/intel/haswell/haswell.h>
-#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
void mainboard_config_rcba(void)
{
}
-void mb_get_spd_map(struct spd_info *spdi)
-{
- spdi->addresses[0] = 0x50;
- spdi->addresses[1] = 0x51;
- spdi->addresses[2] = 0x52;
- spdi->addresses[3] = 0x53;
-}
-
const struct usb2_port_config mainboard_usb2_ports[MAX_USB2_PORTS] = {
{ 0x0110, 1, USB_OC_PIN_SKIP, USB_PORT_FRONT_PANEL }, /* USB3_4_5 */
{ 0x0110, 1, USB_OC_PIN_SKIP, USB_PORT_FRONT_PANEL }, /* USB3_4_5 */