10 files changed, 3 insertions, 56 deletions
diff --git a/src/mainboard/intel/cannonlake_rvp/spd/Makefile.inc b/src/mainboard/intel/cannonlake_rvp/spd/Makefile.inc
index 48e6375819..f052142431 100644
--- a/src/mainboard/intel/cannonlake_rvp/spd/Makefile.inc
+++ b/src/mainboard/intel/cannonlake_rvp/spd/Makefile.inc
@@ -2,8 +2,6 @@
 
 romstage-y += spd_util.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = empty				# 0b000
 SPD_SOURCES += samsung_ddr4_4GB			# 0b001 Dual Channel 4GB
 SPD_SOURCES += samsung_lpddr4_8GB		# 0b001 Dual Channel 8GB
diff --git a/src/mainboard/intel/harcuvar/Kconfig b/src/mainboard/intel/harcuvar/Kconfig
index d110c281a2..dde087ae08 100644
--- a/src/mainboard/intel/harcuvar/Kconfig
+++ b/src/mainboard/intel/harcuvar/Kconfig
@@ -19,6 +19,7 @@ config MAINBOARD_PART_NUMBER
 config ENABLE_FSP_MEMORY_DOWN
 	bool "Enable Memory Down"
 	default n
+	select GENERIC_SPD_BIN
 	help
 	  Select this option to enable Memory Down function.
 
diff --git a/src/mainboard/intel/harcuvar/spd/Makefile.inc b/src/mainboard/intel/harcuvar/spd/Makefile.inc
index 55a6aef7a8..ec07cfb845 100644
--- a/src/mainboard/intel/harcuvar/spd/Makefile.inc
+++ b/src/mainboard/intel/harcuvar/spd/Makefile.inc
@@ -2,23 +2,8 @@
 
 romstage-y += spd.c
 
-SPD_BIN = $(obj)/spd.bin
-
 # Order matters for SPD sources. The following indices
 # define the SPD data to use.
 SPD_SOURCES = micron_4GiB_dimm_MTA9ASF51272PZ-2G1A2
 
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
-
-# Include spd rom data
-$(SPD_BIN): $(SPD_DEPS)
-	for f in $+; \
-	  do for c in $$(cat $$f | grep -v ^#); \
-	    do echo -e -n "\\x$$c"; \
-	  done; \
-	done > $@
-
-cbfs-files-y += spd.bin
-spd.bin-file := $(SPD_BIN)
 spd.bin-position := $(CONFIG_SPD_LOC)
-spd.bin-type := spd
diff --git a/src/mainboard/intel/icelake_rvp/spd/Makefile.inc b/src/mainboard/intel/icelake_rvp/spd/Makefile.inc
index 3114eebaf5..8e3ce25085 100644
--- a/src/mainboard/intel/icelake_rvp/spd/Makefile.inc
+++ b/src/mainboard/intel/icelake_rvp/spd/Makefile.inc
@@ -2,8 +2,6 @@
 
 romstage-y += spd_util.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = empty	# 0b000
 SPD_SOURCES += samsung_K4F6E304HBMGCJ	# 1b001
 SPD_SOURCES += empty	# 2b010
diff --git a/src/mainboard/intel/jasperlake_rvp/spd/Makefile.inc b/src/mainboard/intel/jasperlake_rvp/spd/Makefile.inc
index 3c8040c7c2..ef1eaabd90 100644
--- a/src/mainboard/intel/jasperlake_rvp/spd/Makefile.inc
+++ b/src/mainboard/intel/jasperlake_rvp/spd/Makefile.inc
@@ -1,5 +1,3 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = jslrvp	# 0b000
diff --git a/src/mainboard/intel/kblrvp/spd/Makefile.inc b/src/mainboard/intel/kblrvp/spd/Makefile.inc
index d04269969a..887e4f16fe 100644
--- a/src/mainboard/intel/kblrvp/spd/Makefile.inc
+++ b/src/mainboard/intel/kblrvp/spd/Makefile.inc
@@ -2,8 +2,6 @@
 
 romstage-y += spd_util.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES  = rvp3				# 0b000 Dual Channel 4GB
 SPD_SOURCES += empty				# 0b001
 SPD_SOURCES += empty				# 0b010
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index d7706d16a0..c655a88705 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select SOC_INTEL_SKYLAKE
+	select GENERIC_SPD_BIN
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/intel/kunimitsu/spd/Makefile.inc b/src/mainboard/intel/kunimitsu/spd/Makefile.inc
index 9ecf28d1fe..6a14c293a5 100644
--- a/src/mainboard/intel/kunimitsu/spd/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/spd/Makefile.inc
@@ -2,8 +2,6 @@
 
 romstage-y += spd_util.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES  = hynix_dimm_H9CCNNN8JTALAR-NUD-1G-1866    # 0b0000 Dual Channel 4GB
 SPD_SOURCES += hynix_dimm_H9CCNNN8JTALAR-NUD-1G-1866    # 0b0001 Single Channel 2GB
 SPD_SOURCES += samsung_dimm_K4E8E304EE-EGCF-1G-1866     # 0b0010 Dual Channel 4GB
@@ -20,18 +18,3 @@ SPD_SOURCES += empty                                    # 0b1100
 SPD_SOURCES += empty                                    # 0b1101
 SPD_SOURCES += empty                                    # 0b1110
 SPD_SOURCES += empty                                    # 0b1111
-
-
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
-
-# Include spd ROM data
-$(SPD_BIN): $(SPD_DEPS)
-	for f in $+; \
-	  do for c in $$(cat $$f | grep -v ^#); \
-	    do printf $$(printf '\\%o' 0x$$c); \
-	  done; \
-	done > $@
-
-cbfs-files-y += spd.bin
-spd.bin-file := $(SPD_BIN)
-spd.bin-type := spd
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index 437f5c6348..c94cca6d74 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_INTEL_ISH
 	select EC_ACPI
 	select PCIEXP_HOTPLUG
+	select GENERIC_SPD_BIN
 
 config CHROMEOS
 	bool
diff --git a/src/mainboard/intel/tglrvp/spd/Makefile.inc b/src/mainboard/intel/tglrvp/spd/Makefile.inc
index 8dd1507544..df52042e07 100644
--- a/src/mainboard/intel/tglrvp/spd/Makefile.inc
+++ b/src/mainboard/intel/tglrvp/spd/Makefile.inc
@@ -1,21 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = Micron-MT53D1G64D8SQ-046
 SPD_SOURCES += Samsung-K4UBE3D4AA-MGCL
 SPD_SOURCES += Hynix-H9HKNNNEBMAV-4267
-
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
-
-# Include spd ROM data
-$(SPD_BIN): $(SPD_DEPS)
-	for f in $+; \
-	  do for c in $$(cat $$f | grep -v ^#); \
-	    do printf $$(printf '\%o' 0x$$c); \
-	  done; \
-	done > $@
-
-cbfs-files-y += spd.bin
-spd.bin-file := $(SPD_BIN)
-spd.bin-type := spd