From 98f609aad4b6d6b6a09efaa011a1f02116935acd Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Sun, 29 Mar 2020 13:37:07 -0500
Subject: [PATCH] mb/google/link: Use GENERIC_SPD_BIN

Clean up Link's mainboard dir by putting the SPD files in
a spd subdirectory like all other/newer boards use, and
selecting GENERIC_SPD_BIN to include them in the build.

Test: build google/link and verify spd.bin unchanged

Change-Id: I9c2f9f77dbdd6552c5ae1e7a0df2051b9b85badc
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39909
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
 src/mainboard/google/link/Kconfig                  |  1 +
 src/mainboard/google/link/Makefile.inc             | 14 --------------
 .../link/{ => spd}/elpida_4Gb_1600_x16.spd.hex     |  0
 .../{ => spd}/micron_4Gb_1600_1.35v_x16.spd.hex    |  0
 .../{ => spd}/samsung_4Gb_1600_1.35v_x16.spd.hex   |  0
 5 files changed, 1 insertion(+), 14 deletions(-)
 rename src/mainboard/google/link/{ => spd}/elpida_4Gb_1600_x16.spd.hex (100%)
 rename src/mainboard/google/link/{ => spd}/micron_4Gb_1600_1.35v_x16.spd.hex (100%)
 rename src/mainboard/google/link/{ => spd}/samsung_4Gb_1600_1.35v_x16.spd.hex (100%)

diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 4a32ac2055..2c2a05d37d 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_LPC
+	select GENERIC_SPD_BIN
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index 9152656415..0e720e90ab 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -19,26 +19,12 @@ ramstage-y += chromeos.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 
 smm-y += mainboard_smi.c
-SPD_BIN = $(obj)/spd.bin
 
 # Order of names in SPD_SOURCES is important!
 SPD_SOURCES = elpida_4Gb_1600_x16
 SPD_SOURCES += samsung_4Gb_1600_1.35v_x16
 SPD_SOURCES += micron_4Gb_1600_1.35v_x16
 
-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
 bootblock-y += gpio.c
 romstage-y += gpio.c
 bootblock-y += early_init.c
diff --git a/src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex b/src/mainboard/google/link/spd/elpida_4Gb_1600_x16.spd.hex
similarity index 100%
rename from src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex
rename to src/mainboard/google/link/spd/elpida_4Gb_1600_x16.spd.hex
diff --git a/src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex b/src/mainboard/google/link/spd/micron_4Gb_1600_1.35v_x16.spd.hex
similarity index 100%
rename from src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex
rename to src/mainboard/google/link/spd/micron_4Gb_1600_1.35v_x16.spd.hex
diff --git a/src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex b/src/mainboard/google/link/spd/samsung_4Gb_1600_1.35v_x16.spd.hex
similarity index 100%
rename from src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex
rename to src/mainboard/google/link/spd/samsung_4Gb_1600_1.35v_x16.spd.hex