diff --git a/src/mainboard/intel/wtm2/pei_data.c b/src/mainboard/intel/wtm2/pei_data.c
index 5591c4ca4d..9df5081f23 100644
--- a/src/mainboard/intel/wtm2/pei_data.c
+++ b/src/mainboard/intel/wtm2/pei_data.c
@@ -3,7 +3,7 @@
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void mainboard_fill_spd_data(struct pei_data *pei_data)
 {
 	/* One installed DIMM per channel */
 	pei_data->dimm_channel0_disabled = 2;
@@ -11,7 +11,10 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 
 	pei_data->spd_addresses[0] = 0xa2;
 	pei_data->spd_addresses[2] = 0xa2;
+}
 
+void mainboard_fill_pei_data(struct pei_data *pei_data)
+{
 	pei_data_usb2_port(pei_data, 0, 0x40, 1, USB_OC_PIN_SKIP,
 			   USB_PORT_FRONT_PANEL);
 	pei_data_usb2_port(pei_data, 1, 0x40, 1, USB_OC_PIN_SKIP,
diff --git a/src/mainboard/purism/librem_bdw/variants/librem13v1/pei_data.c b/src/mainboard/purism/librem_bdw/variants/librem13v1/pei_data.c
index 1e5d9d9a1d..93ad4dc34e 100644
--- a/src/mainboard/purism/librem_bdw/variants/librem13v1/pei_data.c
+++ b/src/mainboard/purism/librem_bdw/variants/librem13v1/pei_data.c
@@ -3,13 +3,16 @@
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void mainboard_fill_spd_data(struct pei_data *pei_data)
 {
-	pei_data->ec_present = 1;
-
 	/* One DIMM slot */
 	pei_data->dimm_channel1_disabled = 3;
 	pei_data->spd_addresses[0] = 0xa0;
+}
+
+void mainboard_fill_pei_data(struct pei_data *pei_data)
+{
+	pei_data->ec_present = 1;
 
 	/* P1: Left Side Port (USB2 only) */
 	pei_data_usb2_port(pei_data, 0, 0x0080, 1, USB_OC_PIN_SKIP,
diff --git a/src/mainboard/purism/librem_bdw/variants/librem15v2/pei_data.c b/src/mainboard/purism/librem_bdw/variants/librem15v2/pei_data.c
index c3580b3f8a..025591ab69 100644
--- a/src/mainboard/purism/librem_bdw/variants/librem15v2/pei_data.c
+++ b/src/mainboard/purism/librem_bdw/variants/librem15v2/pei_data.c
@@ -3,9 +3,8 @@
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void mainboard_fill_spd_data(struct pei_data *pei_data)
 {
-	pei_data->ec_present = 1;
 	pei_data->dq_pins_interleaved = 1;
 
 	/* One DIMM slot */
@@ -14,6 +13,11 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 
 	pei_data->spd_addresses[0] = 0xa0;
 	pei_data->spd_addresses[2] = 0xa4;
+}
+
+void mainboard_fill_pei_data(struct pei_data *pei_data)
+{
+	pei_data->ec_present = 1;
 
 	/* P1: Right Side Port (USB2) */
 	pei_data_usb2_port(pei_data, 0, 0x0080, 1, USB_OC_PIN_SKIP,
diff --git a/src/soc/intel/broadwell/raminit.c b/src/soc/intel/broadwell/raminit.c
index 6254071ac8..28b3f37ed9 100644
--- a/src/soc/intel/broadwell/raminit.c
+++ b/src/soc/intel/broadwell/raminit.c
@@ -177,10 +177,6 @@ static void setup_sdram_meminfo(struct pei_data *pei_data)
 	}
 }
 
-__weak void mainboard_fill_spd_data(struct pei_data *pei_data)
-{
-}
-
 void perform_raminit(const struct chipset_power_state *const power_state)
 {
 	const int s3resume = power_state->prev_sleep_state == ACPI_S3;