7 files changed, 6 insertions, 32 deletions
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 6b34105826..1c0586d562 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_T431S
+	select GENERIC_SPD_BIN if BOARD_LENOVO_T431S
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc
index 38d83d6be8..3926956fb7 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc
@@ -1,18 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES  = samsung_4gb  # 0b0010 4GiB
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/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
+LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex)
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index adb999430c..cff79031b2 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
+	select GENERIC_SPD_BIN
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
index e047c6ee58..d3244d1a9c 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
@@ -1,20 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-SPD_BIN = $(obj)/spd.bin
-
-SPD_SOURCES  = elpida.hex    # 0b0000 Single Channel 2GB
-SPD_SOURCES  += hynix.hex    # 0b0001 2GiB
-SPD_SOURCES  += samsung.hex  # 0b0010 4GiB
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f))
-
-# 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
+SPD_SOURCES   = elpida   # 0b0000 Single Channel 2GB
+SPD_SOURCES  += hynix    # 0b0001 2GiB
+SPD_SOURCES  += samsung  # 0b0010 4GiB
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/elpida.hex b/src/mainboard/lenovo/x1_carbon_gen1/spd/elpida.spd.hex
index 816254d379..816254d379 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/elpida.hex
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/elpida.spd.hex
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.hex b/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.spd.hex
index 111745ce2d..111745ce2d 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.hex
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.spd.hex
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex b/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.spd.hex
index 24186362b8..24186362b8 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.spd.hex