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>

12 files changed, 1 insertions, 176 deletions

diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index a3db6d78d8..a43e473f53 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -17,6 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_CYAN
 	select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN
 	select SYSTEM_TYPE_LAPTOP
 	select USE_GOOGLE_FSP
+	select GENERIC_SPD_BIN
 
 if BOARD_GOOGLE_BASEBOARD_CYAN
 
diff --git a/src/mainboard/google/cyan/variants/banon/Makefile.inc b/src/mainboard/google/cyan/variants/banon/Makefile.inc
index 5e3cf38f90..8a9cee84db 100644
--- a/src/mainboard/google/cyan/variants/banon/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/banon/Makefile.inc
@@ -5,8 +5,6 @@ romstage-y += spd_util.c
 
 ramstage-y += gpio.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES =  samsung_2GiB_dimm_K4E8E304EE-EGCF
 SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += empty
@@ -14,17 +12,3 @@ SPD_SOURCES += hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += micron_2GiB_dimm_MT52L256M32D1PF
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
 SPD_SOURCES += nanya_dimm_NT6CL256T32CM-H1
-
-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/google/cyan/variants/celes/Makefile.inc b/src/mainboard/google/cyan/variants/celes/Makefile.inc
index 11f918b79a..2f21fd93d5 100644
--- a/src/mainboard/google/cyan/variants/celes/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/celes/Makefile.inc
@@ -5,21 +5,5 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = samsung_dimm_K4E8E304EE-EGCE    # Index0
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF   # Index1
-
-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/google/cyan/variants/cyan/Makefile.inc b/src/mainboard/google/cyan/variants/cyan/Makefile.inc
index a1521d4234..a5e9dbab3d 100644
--- a/src/mainboard/google/cyan/variants/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/cyan/Makefile.inc
@@ -4,8 +4,6 @@ romstage-y += spd_util.c
 
 ramstage-y += gpio.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES =  samsung_2GiB_dimm_K4B4G1646Q-HYK0
 SPD_SOURCES += hynix_2GiB_dimm_HMT425S6CFR6A_H5TC4G63CFR
 SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0
@@ -14,17 +12,3 @@ SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0
 SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107
 SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0
 SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107
-
-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/google/cyan/variants/edgar/Makefile.inc b/src/mainboard/google/cyan/variants/edgar/Makefile.inc
index b3651eac90..91c0d97a40 100644
--- a/src/mainboard/google/cyan/variants/edgar/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/edgar/Makefile.inc
@@ -5,8 +5,6 @@ romstage-y += spd_util.c
 
 ramstage-y += gpio.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES =  samsung_dimm_K4E8E304EE-EGCE
 SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR-NUD
 SPD_SOURCES += samsung_dimm_K4E8E304EE-EGCE
@@ -19,17 +17,3 @@ SPD_SOURCES += nanya_dimm_NT6CL256T32CM-H1
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
 SPD_SOURCES += nanya_dimm_NT6CL256T32CM-H1
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
-
-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/google/cyan/variants/kefka/Makefile.inc b/src/mainboard/google/cyan/variants/kefka/Makefile.inc
index ff707b4dee..14db7537eb 100644
--- a/src/mainboard/google/cyan/variants/kefka/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/kefka/Makefile.inc
@@ -6,8 +6,6 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107
@@ -16,17 +14,3 @@ SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
-
-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/google/cyan/variants/reks/Makefile.inc b/src/mainboard/google/cyan/variants/reks/Makefile.inc
index b45a2b229e..8b4a77645b 100644
--- a/src/mainboard/google/cyan/variants/reks/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/reks/Makefile.inc
@@ -6,24 +6,8 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = samsung_2GiB_dimm_K4E8E304EE-EGCF
 SPD_SOURCES += hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += micron_2GiB_dimm_MT52L256M32D1PF
 SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += micron_2GiB_dimm_EDF8132A3MA-JD-F
-
-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/google/cyan/variants/relm/Makefile.inc b/src/mainboard/google/cyan/variants/relm/Makefile.inc
index 3de47937e6..47e32bb32b 100644
--- a/src/mainboard/google/cyan/variants/relm/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/relm/Makefile.inc
@@ -6,8 +6,6 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = samsung_2GiB_dimm_K4E8E304EE-EGCF
 SPD_SOURCES += hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += micron_2GiB_dimm_MT52L256M32D1PF
@@ -15,17 +13,3 @@ SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += micron_2GiB_dimm_EDF8132A3MA-JD-F
 SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
-
-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/google/cyan/variants/setzer/Makefile.inc b/src/mainboard/google/cyan/variants/setzer/Makefile.inc
index d99926b203..1735907d8e 100644
--- a/src/mainboard/google/cyan/variants/setzer/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/setzer/Makefile.inc
@@ -6,8 +6,6 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES =  samsung_dimm_K4E8E304EE-EGCF
 SPD_SOURCES += samsung_dimm_K4E8E304EE-EGCF
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTMLAR-NUD
@@ -18,17 +16,3 @@ SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD
-
-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/google/cyan/variants/terra/Makefile.inc b/src/mainboard/google/cyan/variants/terra/Makefile.inc
index af07a93bc7..6358081d66 100644
--- a/src/mainboard/google/cyan/variants/terra/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/terra/Makefile.inc
@@ -6,23 +6,7 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES =  samsung_dimm_K4E8E304EE-EGCE
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += micron_2GiB_dimm_EDF8132A3MA-GD-F-R
 SPD_SOURCES += micron_2GiB_dimm_MT52L256M32D1PF-107WT
-
-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/google/cyan/variants/ultima/Makefile.inc b/src/mainboard/google/cyan/variants/ultima/Makefile.inc
index 10500c43c2..7cb457ef6c 100644
--- a/src/mainboard/google/cyan/variants/ultima/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/ultima/Makefile.inc
@@ -5,23 +5,7 @@ romstage-y += spd_util.c
 ramstage-y += gpio.c
 ramstage-y += ramstage.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = samsung_2GiB_dimm_K4E8E304EE-EGCF
 SPD_SOURCES += hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += micron_2GiB_dimm_EDF8132A3MA-JD-F
 SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
-
-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/google/cyan/variants/wizpig/Makefile.inc b/src/mainboard/google/cyan/variants/wizpig/Makefile.inc
index aa1621addb..b6ff0d058f 100644
--- a/src/mainboard/google/cyan/variants/wizpig/Makefile.inc
+++ b/src/mainboard/google/cyan/variants/wizpig/Makefile.inc
@@ -4,24 +4,8 @@ romstage-y += spd_util.c
 
 ramstage-y += gpio.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES = samsung_2GiB_dimm_K4E8E304EE-EGCE
 SPD_SOURCES += hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD
 SPD_SOURCES += micron_2GiB_dimm_EDF8132A3MA-JD-F
 SPD_SOURCES += samsung_2GiB_dimm_K4E8E324EB-EGCF
 SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR-NUD
-
-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