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>

8 files changed, 1 insertions, 113 deletions

diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 9790552229..af899cfbbc 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -21,6 +21,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
 	select SYSTEM_TYPE_LAPTOP
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
+	select GENERIC_SPD_BIN
 
 if BOARD_GOOGLE_BASEBOARD_GLADOS
 
diff --git a/src/mainboard/google/glados/variants/asuka/Makefile.inc b/src/mainboard/google/glados/variants/asuka/Makefile.inc
index ee3447823f..d1b4d16ba0 100644
--- a/src/mainboard/google/glados/variants/asuka/Makefile.inc
+++ b/src/mainboard/google/glados/variants/asuka/Makefile.inc
@@ -3,25 +3,9 @@
 romstage-y += variant.c
 ramstage-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES  = hynix_dimm_H9CCNNN8GTMLAR-NUD            # 0b0000 Single Channel 2GB
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTMLAR-NUD            # 0b0001 Dual Channel 4GB
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF             # 0b0010 Single Channel 2GB
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF             # 0b0011 Dual Channel 4GB
 SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866  # 0b0100 Single Channel 2GB
 SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866  # 0b0101 Dual Channel 4GB
-
-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/glados/variants/caroline/Makefile.inc b/src/mainboard/google/glados/variants/caroline/Makefile.inc
index a2545fcf08..6a942ee456 100644
--- a/src/mainboard/google/glados/variants/caroline/Makefile.inc
+++ b/src/mainboard/google/glados/variants/caroline/Makefile.inc
@@ -4,23 +4,7 @@ romstage-y += variant.c
 ramstage-y += variant.c
 smm-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 # SPD data by index
 SPD_SOURCES  = samsung_dimm_K4E8E324EB-EGCF     # 0b0000
 SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF     # 0b0001
 SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG     # 0b0010
-
-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/glados/variants/cave/Makefile.inc b/src/mainboard/google/glados/variants/cave/Makefile.inc
index 2f19b3fbd2..88e450ed6f 100644
--- a/src/mainboard/google/glados/variants/cave/Makefile.inc
+++ b/src/mainboard/google/glados/variants/cave/Makefile.inc
@@ -4,8 +4,6 @@ romstage-y += variant.c
 ramstage-y += variant.c
 smm-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 # SPD data by index.  No method for board identification yet
 SPD_SOURCES = micron_4GiB_dimm_MT52L256M32D1PF  # 0b0000
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF     # 0b0001
@@ -13,17 +11,3 @@ SPD_SOURCES += micron_8GiB_dimm_MT52L512M32D2PF # 0b0010
 SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF     # 0b0011
 SPD_SOURCES += micron_16GiB_dimm_MT52L1G32D4PG  # 0b0100
 SPD_SOURCES += hynix_dimm_H9CCNNNCLTMLAR        # 0b0101
-
-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/glados/variants/chell/Makefile.inc b/src/mainboard/google/glados/variants/chell/Makefile.inc
index b820684b7c..53861e9839 100644
--- a/src/mainboard/google/glados/variants/chell/Makefile.inc
+++ b/src/mainboard/google/glados/variants/chell/Makefile.inc
@@ -4,8 +4,6 @@ romstage-y += variant.c
 ramstage-y += variant.c
 smm-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 # SPD data by index.  No method for board identification yet
 SPD_SOURCES = samsung_dimm_K4E8E304EE-EGCF      # 0b0000
 SPD_SOURCES += samsung_dimm_K4E6E304EE-EGCF     # 0b0001
@@ -18,17 +16,3 @@ SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF     # 0b0111
 SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR        # 0b1000
 SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR        # 0b1001
 SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR        # 0b1010
-
-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/glados/variants/glados/Makefile.inc b/src/mainboard/google/glados/variants/glados/Makefile.inc
index 3cf91e8f03..8858453cfc 100644
--- a/src/mainboard/google/glados/variants/glados/Makefile.inc
+++ b/src/mainboard/google/glados/variants/glados/Makefile.inc
@@ -4,24 +4,8 @@ romstage-y += variant.c
 ramstage-y += variant.c
 smm-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 # SPD data by index.  No method for board identification yet
 SPD_SOURCES = empty                             # 0b0000
 SPD_SOURCES += samsung_dimm_K4E6E304EE-EGCF     # 0b0001
 SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR        # 0b0010
 SPD_SOURCES += hynix_dimm_H9CCNNNBLTALAR        # 0b0011
-
-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/glados/variants/lars/Makefile.inc b/src/mainboard/google/glados/variants/lars/Makefile.inc
index e7ab2511f2..f295a360c2 100644
--- a/src/mainboard/google/glados/variants/lars/Makefile.inc
+++ b/src/mainboard/google/glados/variants/lars/Makefile.inc
@@ -3,8 +3,6 @@
 romstage-y += variant.c
 ramstage-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES  = hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866    # 0b0000 Single Channel 2GB
 SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866    # 0b0001 Dual Channel 8GB
 SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF-1G-1866     # 0b0010 Dual Channel 4GB
@@ -21,17 +19,3 @@ SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866     # 0b1100 Single Channel
 SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR                # 0b1101 Dual Channel 8GB
 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/google/glados/variants/sentry/Makefile.inc b/src/mainboard/google/glados/variants/sentry/Makefile.inc
index 019820a4b2..4de16c951a 100644
--- a/src/mainboard/google/glados/variants/sentry/Makefile.inc
+++ b/src/mainboard/google/glados/variants/sentry/Makefile.inc
@@ -3,8 +3,6 @@
 romstage-y += variant.c
 ramstage-y += variant.c
 
-SPD_BIN = $(obj)/spd.bin
-
 SPD_SOURCES  = hynix_dimm_H9CCNNN8GTMLAR-NUD		# 0b0000 Dual Channel 4GB
 SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866	# 0b0001 Dual Channel 4GB
 SPD_SOURCES += samsung_dimm_K4E8E304EE-EGCF		# 0b0010 Dual Channel 4GB
@@ -21,18 +19,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