summaryrefslogtreecommitdiffstats
path: root/src/northbridge/intel/sandybridge/raminit_mrc.c
diff options
context:
space:
mode:
authorKeith Hui <buurin@gmail.com>2023-07-29 11:08:09 -0400
committerFelix Held <felix-coreboot@felixheld.de>2023-11-13 20:31:49 +0000
commitadaeb1102186c8dad56f9feee01ec2189e2d7778 (patch)
tree9b40bd2da619c424798b9fbbb7b2e3cca70a3671 /src/northbridge/intel/sandybridge/raminit_mrc.c
parent45e4ab4a660cb7ce312f2d11a153f2d9ef4158da (diff)
downloadcoreboot-adaeb1102186c8dad56f9feee01ec2189e2d7778.tar.gz
coreboot-adaeb1102186c8dad56f9feee01ec2189e2d7778.tar.bz2
coreboot-adaeb1102186c8dad56f9feee01ec2189e2d7778.zip
nb/intel/sandybridge: Clean up post Haswell SPD mapping API migration
With migration to Haswell SPD mapping interface complete: 1. Remove weak stubs meant to ensure smooth transition and internalizes mainboard_get_spd() within raminit.c. 2. Remove post-mainboard SPD data sanitization code in raminit_mrc.c, now that it fills its own SPD data. 3. Remove old prototypes from raminit_native.h 4a. Drops raminit_native.h from raminit.c, as individual headers therein are already included. 4b. Drop another header from raminit.c IWYU identified as unneeded. asus/p8z77-m still builds afterwards. (sandybridge to receive a full IWYU cleanup later.) Change-Id: Ie073c1386cd0a645069f0e1416263b4fa359b74b Signed-off-by: Keith Hui <buurin@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/76991 Reviewed-by: Martin L Roth <gaumless@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/northbridge/intel/sandybridge/raminit_mrc.c')
-rw-r--r--src/northbridge/intel/sandybridge/raminit_mrc.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c
index de41ae590f69..a1805a2ada88 100644
--- a/src/northbridge/intel/sandybridge/raminit_mrc.c
+++ b/src/northbridge/intel/sandybridge/raminit_mrc.c
@@ -312,9 +312,6 @@ static void devicetree_fill_pei_data(struct pei_data *pei_data)
pei_data->usb3.xhci_streams = cfg->usb3.xhci_streams;
}
-/* Temporary stub */
-__weak void mb_get_spd_map(struct spd_info *spdi) {}
-
static void spd_fill_pei_data(struct pei_data *pei_data)
{
struct spd_info spdi = {0};
@@ -397,19 +394,6 @@ void perform_raminit(int s3resume)
(!pei_data.spd_addresses[2] && !pei_data.spd_data[2][0]) +
(!pei_data.spd_addresses[3] && !pei_data.spd_data[3][0]) * 2;
- /* Fix spd_data. MRC only uses spd_data[0] and ignores the other */
- for (size_t i = 1; i < ARRAY_SIZE(pei_data.spd_data); i++) {
- if (pei_data.spd_data[i][0] && !pei_data.spd_data[0][0]) {
- memcpy(pei_data.spd_data[0], pei_data.spd_data[i],
- sizeof(pei_data.spd_data[0]));
-
- } else if (pei_data.spd_data[i][0] && pei_data.spd_data[0][0]) {
- if (memcmp(pei_data.spd_data[i], pei_data.spd_data[0],
- sizeof(pei_data.spd_data[0])) != 0)
- die("Onboard SPDs must match each other");
- }
- }
-
disable_p2p();
pei_data.boot_mode = s3resume ? 2 : 0;