Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39909 )
Change subject: mb/google/link: Put SPDs in subdirectory ......................................................................
mb/google/link: Put SPDs in subdirectory
Clean up Link's mainboard dir by putting the SPD files in a spd subdirectory like all other/newer boards use.
Test: build google/link and verify spd.bin unchanged
Change-Id: I9c2f9f77dbdd6552c5ae1e7a0df2051b9b85badc Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/google/link/Makefile.inc A src/mainboard/google/link/spd/Makefile.inc R src/mainboard/google/link/spd/elpida_4Gb_1600_x16.spd.hex R src/mainboard/google/link/spd/micron_4Gb_1600_1.35v_x16.spd.hex R src/mainboard/google/link/spd/samsung_4Gb_1600_1.35v_x16.spd.hex 5 files changed, 37 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/39909/1
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc index 9152656..2503125 100644 --- a/src/mainboard/google/link/Makefile.inc +++ b/src/mainboard/google/link/Makefile.inc @@ -12,6 +12,8 @@ ## GNU General Public License for more details. ##
+subdirs-y += spd + ramstage-y += ec.c
romstage-y += chromeos.c @@ -19,26 +21,7 @@ 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/spd/Makefile.inc b/src/mainboard/google/link/spd/Makefile.inc new file mode 100644 index 0000000..b4bb231 --- /dev/null +++ b/src/mainboard/google/link/spd/Makefile.inc @@ -0,0 +1,35 @@ +## +## This file is part of the coreboot project. +## +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; version 2 of the License. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +## DIMM SPD for on-board memory +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)/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/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