4 files changed, 3 insertions, 18 deletions
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index a077520aa1..cbcbb7cd63 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -29,6 +29,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_8192
 	select HUDSON_DISABLE_IMC
 	select USE_BLOBS
+	select GENERIC_SPD_BIN
 	select TPM
 	select MAINBOARD_HAS_LPC_TPM
 
diff --git a/src/mainboard/pcengines/apu2/Makefile.inc b/src/mainboard/pcengines/apu2/Makefile.inc
index 77c6d789c3..3724b1748e 100644
--- a/src/mainboard/pcengines/apu2/Makefile.inc
+++ b/src/mainboard/pcengines/apu2/Makefile.inc
@@ -21,22 +21,6 @@ ramstage-y += BiosCallOuts.c
 ramstage-y += OemCustomize.c
 ramstage-y += gpio_ftns.c
 
-## DIMM SPD for on-board memory
-SPD_BIN = $(obj)/spd.bin
-
 # Order of names in SPD_SOURCES is important!
-SPD_SOURCES  = HYNIX-2G-1333 HYNIX-4G-1333-ECC
-
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(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
+SPD_SOURCES  = HYNIX-2G-1333
+SPD_SOURCES += HYNIX-4G-1333-ECC
diff --git a/src/mainboard/pcengines/apu2/HYNIX-2G-1333.spd.hex b/src/mainboard/pcengines/apu2/spd/HYNIX-2G-1333.spd.hex
index a70db53eda..a70db53eda 100644
--- a/src/mainboard/pcengines/apu2/HYNIX-2G-1333.spd.hex
+++ b/src/mainboard/pcengines/apu2/spd/HYNIX-2G-1333.spd.hex
diff --git a/src/mainboard/pcengines/apu2/HYNIX-4G-1333-ECC.spd.hex b/src/mainboard/pcengines/apu2/spd/HYNIX-4G-1333-ECC.spd.hex
index ac6b4c6c9d..ac6b4c6c9d 100644
--- a/src/mainboard/pcengines/apu2/HYNIX-4G-1333-ECC.spd.hex
+++ b/src/mainboard/pcengines/apu2/spd/HYNIX-4G-1333-ECC.spd.hex