summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2020-03-29 13:37:07 -0500
committerPatrick Georgi <pgeorgi@google.com>2020-03-31 10:34:16 +0000
commit98f609aad4b6d6b6a09efaa011a1f02116935acd (patch)
tree6489e764b05a993ba264a430c5a57a997f964982
parent626963641883519925c98c403eb55ca339ce5b44 (diff)
downloadcoreboot-98f609aad4b6d6b6a09efaa011a1f02116935acd.tar.xz
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>
-rw-r--r--src/mainboard/google/link/Kconfig1
-rw-r--r--src/mainboard/google/link/Makefile.inc14
-rw-r--r--src/mainboard/google/link/spd/elpida_4Gb_1600_x16.spd.hex (renamed from src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex)0
-rw-r--r--src/mainboard/google/link/spd/micron_4Gb_1600_1.35v_x16.spd.hex (renamed from src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex)0
-rw-r--r--src/mainboard/google/link/spd/samsung_4Gb_1600_1.35v_x16.spd.hex (renamed from src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex)0
5 files changed, 1 insertions, 14 deletions
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
index ef36c39b49..ef36c39b49 100644
--- a/src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex
+++ b/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
index 7ed2663fe1..7ed2663fe1 100644
--- 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
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
index 5beb5fcf17..5beb5fcf17 100644
--- 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