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>

4 files changed, 99 insertions, 105 deletions

diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index b938945fa2..237076f8c2 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_GENERIC_IOAPIC
 	select INTEL_INT15
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
+	select GENERIC_SPD_BIN
 
 config VBOOT
 	select VBOOT_VBNV_CMOS
diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc
index 74a635767e..1fd9498c47 100644
--- a/src/mainboard/samsung/lumpy/Makefile.inc
+++ b/src/mainboard/samsung/lumpy/Makefile.inc
@@ -5,18 +5,11 @@ ramstage-y += ec.c
 romstage-y += chromeos.c
 ramstage-y += chromeos.c
 
-SPD_BIN = $(obj)/spd.bin
-
-# Include spd ROM data
-$(SPD_BIN):
-	xxd -rg1 $(src)/mainboard/samsung/lumpy/spd.hex >| $@
-
-cbfs-files-y += spd.bin
-spd.bin-file := $(SPD_BIN)
-spd.bin-type := spd
 bootblock-y += gpio.c
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 bootblock-y += early_init.c
 romstage-y += early_init.c
+
+SPD_SOURCES = lumpy
diff --git a/src/mainboard/samsung/lumpy/spd.hex b/src/mainboard/samsung/lumpy/spd.hex
deleted file mode 100644
index 8690886207..0000000000
--- a/src/mainboard/samsung/lumpy/spd.hex
+++ /dev/null
@@ -1,96 +0,0 @@
-0000000: 92 10 0b 03 02 11 00 01 03 52 01 08 0c 00 3e 00  .........R....>.
-0000010: 69 78 69 30 69 11 20 89 70 03 3c 3c 00 f0 83 01  ixi0i. .p.<<....
-0000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000030: 00 00 00 00 00 00 00 00 00 00 00 00 0f 11 21 00  ..............!.
-0000040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000070: 00 00 00 00 00 80 ce 01 00 00 00 00 00 00 d3 0d  ................
-0000080: 4d 34 37 31 42 32 38 37 33 46 48 53 2d 43 48 39  M471B2873FHS-CH9
-0000090: 20 20 00 00 80 ce 00 00 00 00 00 00 00 00 00 00    ..............
-00000a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00000b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00000c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00000d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00000e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00000f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000100: 92 10 0b 03 02 11 00 01 03 52 01 08 0f 00 1e 00  .........R......
-0000110: 69 78 69 3c 69 11 2c 95 70 03 3c 3c 01 2c 83 01  ixi<i.,.p.<<.,..
-0000120: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000130: 00 00 00 00 00 00 00 00 00 00 00 00 0f 11 21 00  ..............!.
-0000140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000160: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000170: 00 00 00 00 00 80 ce 02 10 31 81 1d 77 ce 91 a4  .........1..w...
-0000180: 4d 34 37 31 42 32 38 37 33 46 48 53 2d 43 46 38  M471B2873FHS-CF8
-0000190: 20 20 00 00 80 ce 00 00 00 53 47 30 44 35 31 31    .......SG0D511
-00001a0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00001b0: 01 a0 04 38 20 06 57 31 00 00 00 00 00 00 00 00  ...8 .W1........
-00001c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00001d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00001e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00001f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000200: 92 10 0b 03 03 19 00 01 03 52 01 08 0c 00 7e 00  .........R....~.
-0000210: 69 78 69 30 69 11 20 89 00 05 3c 3c 00 f0 83 81  ixi0i. ...<<....
-0000220: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000230: 00 00 00 00 00 00 00 00 00 00 00 00 0f 11 41 00  ..............A.
-0000240: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000250: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000260: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000270: 00 00 00 00 00 02 fe 00 00 00 00 00 00 00 29 2b  ..............)+
-0000280: 45 42 4a 32 30 55 46 38 42 44 55 30 2d 44 4a 2d  EBJ20UF8BDU0-DJ-
-0000290: 46 20 30 20 02 fe 00 00 00 00 00 00 00 00 00 00  F 0 ............
-00002a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00002b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00002c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00002d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00002e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00002f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000300: 92 11 0b 03 02 11 00 01 03 11 01 08 0c 00 3e 00  ..............>.
-0000310: 69 78 69 30 69 11 20 89 70 03 3c 3c 00 f0 83 01  ixi0i. .p.<<....
-0000320: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000330: 00 00 00 00 00 00 00 00 00 00 00 00 0f 11 41 00  ..............A.
-0000340: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000350: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000360: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000370: 00 00 00 00 00 80 ce 01 00 00 00 00 00 00 cf 74  ...............t
-0000380: 4d 34 37 31 42 32 38 37 33 47 42 30 2d 43 48 39  M471B2873GB0-CH9
-0000390: 20 20 00 00 80 ce 00 00 00 00 00 00 00 00 00 00    ..............
-00003a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00003b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00003c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00003d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00003e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00003f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000400: 92 11 0b 03 02 11 00 01 03 11 01 08 0f 00 1e 00  ................
-0000410: 69 78 69 3c 69 11 2c 95 70 03 3c 3c 01 2c 83 01  ixi<i.,.p.<<.,..
-0000420: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000430: 00 00 00 00 00 00 00 00 00 00 00 00 0f 11 41 00  ..............A.
-0000440: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000450: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000460: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000470: 00 00 00 00 00 80 ce 01 00 00 00 00 00 00 8d dd  ................
-0000480: 4d 34 37 31 42 32 38 37 33 47 42 30 2d 43 46 38  M471B2873GB0-CF8
-0000490: 20 20 00 00 80 ce 00 00 00 00 00 00 00 00 00 00    ..............
-00004a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00004b0: 01 a0 04 38 20 06 57 31 00 00 00 00 00 00 00 00  ...8 .W1........
-00004c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00004d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00004e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00004f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000500: 92 10 0b 03 03 19 00 01 03 52 01 08 0c 00 3e 00  .........R....>.
-0000510: 69 78 69 30 69 11 20 89 00 05 3c 3c 00 f0 83 01  ixi0i. ...<<....
-0000520: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000530: 00 00 00 00 00 00 00 00 00 00 00 00 0f 11 21 00  ..............!.
-0000540: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000550: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000560: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-0000570: 00 00 00 00 00 80 ce 01 00 00 00 00 00 00 4c db  ..............L.
-0000580: 4d 34 37 31 42 35 37 37 33 43 48 53 2d 43 48 39  M471B5773CHS-CH9
-0000590: 20 20 00 00 80 ce 00 00 00 53 30 58 44 30 30 30    .......S0XD000
-00005a0: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00005b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00005c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00005d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00005e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-00005f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
diff --git a/src/mainboard/samsung/lumpy/spd/lumpy.spd.hex b/src/mainboard/samsung/lumpy/spd/lumpy.spd.hex
new file mode 100644
index 0000000000..abd3ebf290
--- /dev/null
+++ b/src/mainboard/samsung/lumpy/spd/lumpy.spd.hex
@@ -0,0 +1,96 @@
+92 10 0b 03 02 11 00 01 03 52 01 08 0c 00 3e 00
+69 78 69 30 69 11 20 89 70 03 3c 3c 00 f0 83 01
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0f 11 21 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 80 ce 01 00 00 00 00 00 00 d3 0d
+4d 34 37 31 42 32 38 37 33 46 48 53 2d 43 48 39
+20 20 00 00 80 ce 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+92 10 0b 03 02 11 00 01 03 52 01 08 0f 00 1e 00
+69 78 69 3c 69 11 2c 95 70 03 3c 3c 01 2c 83 01
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0f 11 21 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 80 ce 02 10 31 81 1d 77 ce 91 a4
+4d 34 37 31 42 32 38 37 33 46 48 53 2d 43 46 38
+20 20 00 00 80 ce 00 00 00 53 47 30 44 35 31 31
+01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+01 a0 04 38 20 06 57 31 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+92 10 0b 03 03 19 00 01 03 52 01 08 0c 00 7e 00
+69 78 69 30 69 11 20 89 00 05 3c 3c 00 f0 83 81
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0f 11 41 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 02 fe 00 00 00 00 00 00 00 29 2b
+45 42 4a 32 30 55 46 38 42 44 55 30 2d 44 4a 2d
+46 20 30 20 02 fe 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+92 11 0b 03 02 11 00 01 03 11 01 08 0c 00 3e 00
+69 78 69 30 69 11 20 89 70 03 3c 3c 00 f0 83 01
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0f 11 41 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 80 ce 01 00 00 00 00 00 00 cf 74
+4d 34 37 31 42 32 38 37 33 47 42 30 2d 43 48 39
+20 20 00 00 80 ce 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+92 11 0b 03 02 11 00 01 03 11 01 08 0f 00 1e 00
+69 78 69 3c 69 11 2c 95 70 03 3c 3c 01 2c 83 01
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0f 11 41 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 80 ce 01 00 00 00 00 00 00 8d dd
+4d 34 37 31 42 32 38 37 33 47 42 30 2d 43 46 38
+20 20 00 00 80 ce 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+01 a0 04 38 20 06 57 31 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+92 10 0b 03 03 19 00 01 03 52 01 08 0c 00 3e 00
+69 78 69 30 69 11 20 89 00 05 3c 3c 00 f0 83 01
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 0f 11 21 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 80 ce 01 00 00 00 00 00 00 4c db
+4d 34 37 31 42 35 37 37 33 43 48 53 2d 43 48 39
+20 20 00 00 80 ce 00 00 00 53 30 58 44 30 30 30
+01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00