summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2018-05-24 16:34:31 -0600
committerMartin Roth <martinroth@google.com>2018-05-30 14:29:19 +0000
commitddb2a77511f8fc20c0de3bd29161467ed224c01e (patch)
tree8e8e36d7a2a0fd3f46db8199ec9bd2ae55dc5f62
parent438b463a8f5f739eb02422a3d00b8dfcbeefc2e9 (diff)
mainboard/google/kahlee: move SPDs to variants/baseboard/spd
The SPD files will be common to many of the mainboards, so move them out of grunt and into the variants/baseboard directory. BUG=b:80106042 TEST=Build grunt, make sure spd.bin is the same. Change-Id: I53975a46a8c7d7e519bb6f7ef6ccd0b817ac4c92 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/26523 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc (renamed from src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc)2
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075:E.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E:B.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex (renamed from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex)0
-rw-r--r--src/mainboard/google/kahlee/variants/grunt/Makefile.inc2
9 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
index 128edf0b9a..b90357531c 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
@@ -14,7 +14,7 @@
## GNU General Public License for more details.
##
-LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex)
+LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/baseboard/spd/$(f).spd.hex)
SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000
SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
index 67b46cd239..67b46cd239 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
index 5f31fede26..5f31fede26 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
index 4430061425..4430061425 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075:E.spd.hex
index 23792feecb..23792feecb 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075:E.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E:B.spd.hex
index abb5ce8d67..abb5ce8d67 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E:B.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
index b3fa5a398a..b3fa5a398a 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
index 81c8ce58e9..81c8ce58e9 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
index 3ef10b3731..36f55fd85b 100644
--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
-subdirs-y += spd
+subdirs-y += ../baseboard/spd
romstage-y += romstage.c