diff --git a/src/mainboard/intel/jasperlake_rvp/spd/spd_util.c b/src/mainboard/intel/jasperlake_rvp/spd/spd_util.c
deleted file mode 100644
index bc891fbab7..0000000000
--- a/src/mainboard/intel/jasperlake_rvp/spd/spd_util.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* This file is part of the coreboot project. */
-
-#include <arch/cpu.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "../board_id.h"
-#include "spd.h"
-
-enum jsl_dimm_type {
-	jsl_u_ddr4 = 0,
-	jsl_u_lpddr4 = 1,
-	jsl_u_lpddr4_type_3 = 4,
-	jsl_y_lpddr4 = 6
-};
-
-void mainboard_fill_dq_map_ch0(u8 *dq_map_ptr)
-{
-	/* DQ byte map Ch0 */
-	const u8 dq_map[12] = {
-		0x0F, 0xF0, 0x0F, 0xF0, 0xFF, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-	memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
-}
-
-static uint8_t get_spd_index(void)
-{
-	return get_board_id() & 0x7;
-}
-
-void mainboard_fill_dq_map_ch1(u8 *dq_map_ptr)
-{
-	const u8 dq_map[12] = {
-		0x0F, 0xF0, 0x0F, 0xF0, 0xFF, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-	memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
-}
-
-void mainboard_fill_dqs_map_ch0(u8 *dqs_map_ptr)
-{
-	/* DQS CPU<>DRAM map Ch0 */
-	const u8 dqs_map_u_ddr[8] = { 2, 0, 1, 3, 6, 4, 7, 5 };
-	const u8 dqs_map_u_lpddr[8] = { 2, 3, 0, 1, 7, 6, 4, 5 };
-	const u8 dqs_map_u_lpddr_type_3[8] = { 2, 3, 1, 0, 7, 6, 4, 5 };
-	const u8 dqs_map_y_lpddr[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
-
-	switch (get_spd_index()) {
-	case jsl_u_ddr4:
-		memcpy(dqs_map_ptr, dqs_map_u_ddr, sizeof(dqs_map_u_ddr));
-		break;
-	case jsl_u_lpddr4:
-		memcpy(dqs_map_ptr, dqs_map_u_lpddr, sizeof(dqs_map_u_lpddr));
-		break;
-	case jsl_u_lpddr4_type_3:
-		memcpy(dqs_map_ptr, dqs_map_u_lpddr_type_3,
-				 sizeof(dqs_map_u_lpddr_type_3));
-		break;
-	case jsl_y_lpddr4:
-		memcpy(dqs_map_ptr, dqs_map_y_lpddr, sizeof(dqs_map_y_lpddr));
-		break;
-	default:
-		break;
-	}
-}
-
-void mainboard_fill_dqs_map_ch1(u8 *dqs_map_ptr)
-{
-	/* DQS CPU<>DRAM map Ch1 */
-	const u8 dqs_map_u_ddr[8] = { 1, 3, 2, 0, 5, 7, 6, 4 };
-	const u8 dqs_map_u_lpddr[8] = { 1, 0, 3, 2, 5, 4, 7, 6  };
-	const u8 dqs_map_y_lpddr[8] = { 0, 1, 2, 3, 5, 4, 7, 6 };
-
-	switch (get_spd_index()) {
-	case jsl_u_ddr4:
-		memcpy(dqs_map_ptr, dqs_map_u_ddr, sizeof(dqs_map_u_ddr));
-		break;
-	case jsl_u_lpddr4:
-	case jsl_u_lpddr4_type_3:
-		memcpy(dqs_map_ptr, dqs_map_u_lpddr, sizeof(dqs_map_u_lpddr));
-		break;
-	case jsl_y_lpddr4:
-		memcpy(dqs_map_ptr, dqs_map_y_lpddr, sizeof(dqs_map_y_lpddr));
-		break;
-	default:
-		break;
-	}
-}
-
-void mainboard_fill_rcomp_res_data(u16 *rcomp_ptr)
-{
-	/* Rcomp resistor */
-	const u16 RcompResistor[3] = { 100, 100, 100 };
-	memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor));
-}
-
-void mainboard_fill_rcomp_strength_data(u16 *rcomp_strength_ptr)
-{
-	/* Rcomp target */
-	static const u16 RcompTarget_DDR4[RCOMP_TARGET_PARAMS] = {
-			100, 33, 32, 33, 28 };
-	static const u16 RcompTarget_LPDDR4_Ax[RCOMP_TARGET_PARAMS] = {
-			80, 40, 40, 40, 30 };
-
-	switch (get_spd_index()) {
-	case jsl_u_ddr4:
-		memcpy(rcomp_strength_ptr, RcompTarget_DDR4,
-				sizeof(RcompTarget_DDR4));
-		break;
-	case jsl_y_lpddr4:
-	case jsl_u_lpddr4:
-	case jsl_u_lpddr4_type_3:
-		memcpy(rcomp_strength_ptr, RcompTarget_LPDDR4_Ax,
-				sizeof(RcompTarget_LPDDR4_Ax));
-		break;
-	default:
-		break;
-	}
-}
diff --git a/src/mainboard/intel/tglrvp/spd/spd_util.c b/src/mainboard/intel/tglrvp/spd/spd_util.c
deleted file mode 100644
index 9110cb1b1b..0000000000
--- a/src/mainboard/intel/tglrvp/spd/spd_util.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* This file is part of the coreboot project. */
-
-#include <arch/cpu.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "../board_id.h"
-#include "spd.h"
-
-enum tgl_dimm_type {
-	tgl_u_ddr4 = 0,
-	tgl_u_lpddr4 = 1,
-	tgl_u_lpddr4_type_3 = 4,
-	tgl_y_lpddr4 = 6
-};
-
-static uint8_t get_spd_index(void)
-{
-	uint8_t spd_index = (get_board_id() & 0x1F) & 0x7;
-
-	return spd_index;
-}
-
-void mainboard_fill_dq_map_ch0(u8 *dq_map_ptr)
-{
-	/* DQ byte map Ch0 */
-	const u8 dq_map[12] = {
-		0x0F, 0xF0, 0x0F, 0xF0, 0xFF, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-	memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
-}
-
-void mainboard_fill_dq_map_ch1(u8 *dq_map_ptr)
-{
-	const u8 dq_map[12] = {
-		0x0F, 0xF0, 0x0F, 0xF0, 0xFF, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-	memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
-}
-
-void mainboard_fill_dqs_map_ch0(u8 *dqs_map_ptr)
-{
-	/* DQS CPU<>DRAM map Ch0 */
-	const u8 dqs_map_u_ddr[8] = { 2, 0, 1, 3, 6, 4, 7, 5 };
-	const u8 dqs_map_u_lpddr[8] = { 2, 3, 0, 1, 7, 6, 4, 5 };
-	const u8 dqs_map_u_lpddr_type_3[8] = { 2, 3, 1, 0, 7, 6, 4, 5 };
-	const u8 dqs_map_y_lpddr[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
-
-	switch (get_spd_index()) {
-	case tgl_u_ddr4:
-		memcpy(dqs_map_ptr, dqs_map_u_ddr, sizeof(dqs_map_u_ddr));
-		break;
-	case tgl_u_lpddr4:
-		memcpy(dqs_map_ptr, dqs_map_u_lpddr, sizeof(dqs_map_u_lpddr));
-		break;
-	case tgl_u_lpddr4_type_3:
-		memcpy(dqs_map_ptr, dqs_map_u_lpddr_type_3,
-				 sizeof(dqs_map_u_lpddr_type_3));
-		break;
-	case tgl_y_lpddr4:
-		memcpy(dqs_map_ptr, dqs_map_y_lpddr, sizeof(dqs_map_y_lpddr));
-		break;
-	default:
-		break;
-	}
-}
-
-void mainboard_fill_dqs_map_ch1(u8 *dqs_map_ptr)
-{
-	/* DQS CPU<>DRAM map Ch1 */
-	const u8 dqs_map_u_ddr[8] = { 1, 3, 2, 0, 5, 7, 6, 4 };
-	const u8 dqs_map_u_lpddr[8] = { 1, 0, 3, 2, 5, 4, 7, 6  };
-	const u8 dqs_map_y_lpddr[8] = { 0, 1, 2, 3, 5, 4, 7, 6 };
-
-	switch (get_spd_index()) {
-	case tgl_u_ddr4:
-		memcpy(dqs_map_ptr, dqs_map_u_ddr, sizeof(dqs_map_u_ddr));
-		break;
-	case tgl_u_lpddr4:
-	case tgl_u_lpddr4_type_3:
-		memcpy(dqs_map_ptr, dqs_map_u_lpddr, sizeof(dqs_map_u_lpddr));
-		break;
-	case tgl_y_lpddr4:
-		memcpy(dqs_map_ptr, dqs_map_y_lpddr, sizeof(dqs_map_y_lpddr));
-		break;
-	default:
-		break;
-	}
-}
-
-void mainboard_fill_rcomp_res_data(u16 *rcomp_ptr)
-{
-	/* Rcomp resistor */
-	const u16 RcompResistor[3] = { 100, 100, 100 };
-	memcpy(rcomp_ptr, RcompResistor, sizeof(RcompResistor));
-}
-
-void mainboard_fill_rcomp_strength_data(u16 *rcomp_strength_ptr)
-{
-	/* Rcomp target */
-	static const u16 RcompTarget_DDR4[RCOMP_TARGET_PARAMS] = {
-			100, 33, 32, 33, 28 };
-	static const u16 RcompTarget_LPDDR4_Ax[RCOMP_TARGET_PARAMS] = {
-			80, 40, 40, 40, 30 };
-
-	switch (get_spd_index()) {
-	case tgl_u_ddr4:
-		memcpy(rcomp_strength_ptr, RcompTarget_DDR4,
-				sizeof(RcompTarget_DDR4));
-		break;
-	case tgl_y_lpddr4:
-	case tgl_u_lpddr4:
-	case tgl_u_lpddr4_type_3:
-		memcpy(rcomp_strength_ptr, RcompTarget_LPDDR4_Ax,
-				sizeof(RcompTarget_LPDDR4_Ax));
-		break;
-	default:
-		break;
-	}
-}