mb: remove duplicated Make code for spd.bin generation

Drop duplicated code for spd.bin generation that is provided globally
in lib/Makefile.inc.

For all affected boards it has been verified that the output binary
functionally matches the original one. The changed execution order of
Make instructions influenced the cbfs file order. Hence, the rom images
can't be compared directly.

Thus, the output files of the two timeless abuild runs have been compared.
Further, it was verified that the final files in cbfs stay identical, by
comparing the extracted cbfs of each board.

The boards (possibly) needing modification could be found with something
like this (with false positives, though):

find src/mainboard -name Makefile.inc | \
  xargs egrep 'SPD_BIN|SPD_DEPS' | cut -d: -f1 | sort -u

Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Change-Id: Icd3ac0fd6c901228554115c6350d88bb49874587
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

5 files changed, 5 insertions, 64 deletions

diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 931d3ce55f..5a16d23ca8 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -17,6 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY
 	select MAINBOARD_HAS_LIBGFXINIT
 	select INTEL_GMA_HAVE_VBT
 	select DRIVERS_I2C_RTD2132 if BOARD_GOOGLE_LEON
+	select GENERIC_SPD_BIN
 
 if BOARD_GOOGLE_BASEBOARD_SLIPPY
 
diff --git a/src/mainboard/google/slippy/variants/falco/Makefile.inc b/src/mainboard/google/slippy/variants/falco/Makefile.inc
index 6d1ee81ec7..d8d748b726 100644
--- a/src/mainboard/google/slippy/variants/falco/Makefile.inc
+++ b/src/mainboard/google/slippy/variants/falco/Makefile.inc
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-## DIMM SPD for on-board memory
-SPD_BIN = $(obj)/spd.bin
-
 # Order of names in SPD_SOURCES is important!
 SPD_SOURCES  = Micron_4KTF25664HZ     # 4GB / CH0 + CH1 (RAM_ID=000)
 SPD_SOURCES += Hynix_HMT425S6AFR6A    # 4GB / CH0 + CH1 (RAM_ID=001)
@@ -13,16 +10,4 @@ SPD_SOURCES += Elpida_EDJ4216EFBG     # 2GB / CH0 only  (RAM_ID=101)
 SPD_SOURCES += Samsung_M471B5674QH0   # 4GB / CH0 + CH1 (RAM_ID=110)
 SPD_SOURCES += Samsung_M471B5674QH0   # 2GB / CH0 only  (RAM_ID=111)
 
-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/google/slippy/variants/leon/Makefile.inc b/src/mainboard/google/slippy/variants/leon/Makefile.inc
index 3dab895e9c..213dadb006 100644
--- a/src/mainboard/google/slippy/variants/leon/Makefile.inc
+++ b/src/mainboard/google/slippy/variants/leon/Makefile.inc
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-## DIMM SPD for on-board memory
-SPD_BIN = $(obj)/spd.bin
-
 # Order of names in SPD_SOURCES is important!
 SPD_SOURCES  = Micron_4KTF25664HZ	# 0: 4GB / CH0 + CH1
 SPD_SOURCES += Hynix_HMT425S6AFR6A	# 1: 4GB / CH0 + CH1
@@ -12,16 +9,4 @@ SPD_SOURCES += Micron_4KTF25664HZ	# 4: space holder
 SPD_SOURCES += Hynix_HMT425S6AFR6A	# 5: 2GB / CH0
 SPD_SOURCES += Samsung_K4B4G1646Q	# 6: 2GB / CH0
 
-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/google/slippy/variants/peppy/Makefile.inc b/src/mainboard/google/slippy/variants/peppy/Makefile.inc
index c19326e0c5..f8c5b0d88f 100644
--- a/src/mainboard/google/slippy/variants/peppy/Makefile.inc
+++ b/src/mainboard/google/slippy/variants/peppy/Makefile.inc
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-## DIMM SPD for on-board memory
-SPD_BIN = $(obj)/spd.bin
-
 # Order of names in SPD_SOURCES is important!
 SPD_SOURCES  = Micron_4KTF25664HZ	# 0: 4GB / CH0 + CH1
 SPD_SOURCES += Hynix_HMT425S6AFR6A	# 1: 4GB / CH0 + CH1
@@ -13,16 +10,4 @@ SPD_SOURCES += Hynix_HMT425S6AFR6A	# 5: 2GB / CH0 + CH1
 SPD_SOURCES += Elpida_EDJ4216EFBG	# 6: 2GB / CH0 + CH1
 SPD_SOURCES += Hynix_HMT425S6CFR6A	# 7: 2GB / CH0 + CH1
 
-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/google/slippy/variants/wolf/Makefile.inc b/src/mainboard/google/slippy/variants/wolf/Makefile.inc
index 3306b797f0..cd38d98051 100644
--- a/src/mainboard/google/slippy/variants/wolf/Makefile.inc
+++ b/src/mainboard/google/slippy/variants/wolf/Makefile.inc
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-## DIMM SPD for on-board memory
-SPD_BIN = $(obj)/spd.bin
-
 # Order of names in SPD_SOURCES is important!
 SPD_SOURCES  = Micron_4KTF25664HZ	# 0: 4GB / CH0 + CH1
 SPD_SOURCES += Hynix_HMT425S6AFR6A	# 1: 4GB / CH0 + CH1
@@ -11,16 +8,4 @@ SPD_SOURCES += Micron_4KTF25664HZ	# 3: 2GB / CH0
 SPD_SOURCES += Hynix_HMT425S6AFR6A	# 4: 2GB / CH0
 SPD_SOURCES += Samsung_K4B4G1646B	# 4: 2GB / CH0
 
-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)