diff --git a/src/soc/intel/xeon_sp/Makefile.mk b/src/soc/intel/xeon_sp/Makefile.mk
index 0fc32d86a0..c66b8ad6cb 100644
--- a/src/soc/intel/xeon_sp/Makefile.mk
+++ b/src/soc/intel/xeon_sp/Makefile.mk
@@ -10,6 +10,7 @@ subdirs-$(CONFIG_SOC_INTEL_GRANITERAPIDS) += gnr ibl
 bootblock-y += bootblock.c spi.c lpc.c pch.c report_platform.c
 romstage-y += romstage.c reset.c util.c spi.c pmutil.c memmap.c ddr.c
 romstage-y += config.c
+romstage-y += dimm.c
 romstage-y += ../../../cpu/intel/car/romstage.c
 ramstage-y += uncore.c reset.c util.c lpc.c spi.c ramstage.c chip_common.c
 ramstage-y += memmap.c pch.c lockdown.c finalize.c
diff --git a/src/soc/intel/xeon_sp/cpx/Makefile.mk b/src/soc/intel/xeon_sp/cpx/Makefile.mk
index a24b50e035..b54b0ef3ba 100644
--- a/src/soc/intel/xeon_sp/cpx/Makefile.mk
+++ b/src/soc/intel/xeon_sp/cpx/Makefile.mk
@@ -6,7 +6,6 @@ subdirs-y += ../../../../cpu/intel/turbo
 subdirs-y += ../../../../cpu/intel/microcode
 
 romstage-y += romstage.c soc_util.c
-romstage-y += ../dimm.c
 romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c
 romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c
 
diff --git a/src/soc/intel/xeon_sp/gnr/Makefile.mk b/src/soc/intel/xeon_sp/gnr/Makefile.mk
index 9b074085d7..054d5132c1 100644
--- a/src/soc/intel/xeon_sp/gnr/Makefile.mk
+++ b/src/soc/intel/xeon_sp/gnr/Makefile.mk
@@ -12,7 +12,6 @@ subdirs-y += ../../../../cpu/intel/microcode
 romstage-y += romstage.c
 romstage-y += soc_util.c
 romstage-y += soc_iio.c
-romstage-y += ../dimm.c
 romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c
 
 ramstage-y += chip.c
diff --git a/src/soc/intel/xeon_sp/skx/romstage.c b/src/soc/intel/xeon_sp/skx/romstage.c
index 21b35229bd..f66022d364 100644
--- a/src/soc/intel/xeon_sp/skx/romstage.c
+++ b/src/soc/intel/xeon_sp/skx/romstage.c
@@ -26,4 +26,37 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
 	m_cfg->VTdConfig.ATS = config->ats_support;
 }
 
-void save_dimm_info(void) {}
+uint8_t get_error_correction_type(const uint8_t RasModesEnabled)
+{
+	switch (RasModesEnabled) {
+	case CH_INDEPENDENT:
+		return MEMORY_ARRAY_ECC_SINGLE_BIT;
+	case FULL_MIRROR_1LM:
+	case PARTIAL_MIRROR_1LM:
+	case FULL_MIRROR_2LM:
+	case PARTIAL_MIRROR_2LM:
+		return MEMORY_ARRAY_ECC_MULTI_BIT;
+	case RK_SPARE:
+		return MEMORY_ARRAY_ECC_SINGLE_BIT;
+	case CH_LOCKSTEP:
+		return MEMORY_ARRAY_ECC_SINGLE_BIT;
+	default:
+		return MEMORY_ARRAY_ECC_MULTI_BIT;
+	}
+}
+
+uint32_t get_max_capacity_mib(void)
+{
+	/* According to Dear Customer Letter it's 1.12 TB per processor. */
+	return 1.12 * MiB * CONFIG_MAX_SOCKET;
+}
+
+uint8_t get_max_dimm_count(void)
+{
+	return MAX_DIMM;
+}
+
+uint8_t get_dram_type(const struct SystemMemoryMapHob *hob)
+{
+	return MEMORY_TYPE_DDR4;
+}
diff --git a/src/soc/intel/xeon_sp/spr/Makefile.mk b/src/soc/intel/xeon_sp/spr/Makefile.mk
index c5f9ece677..f1755e4828 100644
--- a/src/soc/intel/xeon_sp/spr/Makefile.mk
+++ b/src/soc/intel/xeon_sp/spr/Makefile.mk
@@ -9,7 +9,6 @@ subdirs-y += ../../../../cpu/x86/tsc
 subdirs-y += ../../../../cpu/intel/microcode
 
 romstage-y += romstage.c soc_util.c
-romstage-y += ../dimm.c
 romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c
 romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c
 
diff --git a/src/vendorcode/intel/fsp/fsp2_0/skylake_sp/hob_memmap.h b/src/vendorcode/intel/fsp/fsp2_0/skylake_sp/hob_memmap.h
index f97056a4df..5a1b2f21a6 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/skylake_sp/hob_memmap.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/skylake_sp/hob_memmap.h
@@ -36,6 +36,15 @@ are permitted provided that the following conditions are met:
 	0xbd, 0x56, 0xda, 0x91, 0xc0, 0x7f \
 	}
 
+#define CH_INDEPENDENT		0
+#define FULL_MIRROR_1LM		BIT0
+#define FULL_MIRROR_2LM		BIT1
+#define CH_LOCKSTEP		BIT2
+#define RK_SPARE		BIT3
+#define PARTIAL_MIRROR_1LM	BIT5
+#define PARTIAL_MIRROR_2LM	BIT6
+#define STAT_VIRT_LOCKSTEP	BIT7
+
 #define MEMTYPE_1LM_MASK       (1 << 0)
 #define MEMTYPE_2LM_MASK       (1 << 1)
 #define MEMTYPE_VOLATILE_MASK  (MEMTYPE_1LM_MASK | MEMTYPE_2LM_MASK)
@@ -50,6 +59,34 @@ are permitted provided that the following conditions are met:
 
 #pragma pack(1)
 
+typedef struct DimmDevice {
+	UINT8    Present;
+	UINT8    reserved1[3];
+	UINT8    NumRanks;
+	UINT8    reserved2[1];
+	UINT8    actKeyByte2;
+	UINT8    reserved3[9];
+	UINT16   DimmSize;
+	UINT8    reserved4[8];
+	UINT16   VendorID;
+	UINT16   DeviceID;
+	UINT8    reserved5[24];
+	UINT8    serialNumber[4];
+	UINT8    PartNumber[4];
+	UINT8    reserved6[50];
+	INT32    commonTck;
+	UINT8    reserved7[24];
+} MEMMAP_DIMM_DEVICE_INFO_STRUCT;
+
+struct ChannelDevice {
+	UINT8    reserved1[191];
+	MEMMAP_DIMM_DEVICE_INFO_STRUCT    DimmInfo[MAX_IMC];
+};
+typedef struct socket {
+	UINT8    reserved[2075];
+	struct   ChannelDevice ChannelInfo[MAX_CH];
+} MEMMAP_SOCKET;
+
 struct SystemMemoryMapElement {
 	UINT8    NodeId;         // Node ID of the HA Owning the memory
 	UINT8    SocketId;       // Socket Id of socket that has his memory - ONLY IN NUMA
@@ -98,7 +135,7 @@ struct SystemMemoryMapHob {
 	UINT8	maxCh;
 	struct  SystemMemoryMapElement Element[MAX_SOCKET * SAD_RULES];
 	UINT8	reserved1[982];
-	UINT8	reserved2[4901*MAX_SOCKET];
+	MEMMAP_SOCKET Socket[MAX_SOCKET];
 	UINT8	reserved3[707];
 };