[coreboot-gerrit] Change in coreboot[master]: mainboard/google/grunt: move SPDs to variants/spd

Martin Roth (Code Review) gerrit at coreboot.org
Fri May 25 01:14:15 CEST 2018 

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/26523


Change subject: mainboard/google/grunt: move SPDs to variants/spd
......................................................................

mainboard/google/grunt: move SPDs to variants/spd

The SPD files will be common to many of the mainboards, so move them out
of grunt and into the variants directory.
Keep the Makefile including the SPDs in Grunt.

BUG=b:80106042
TEST=Build grunt, make sure spd.bin is the same.

Change-Id: I53975a46a8c7d7e519bb6f7ef6ccd0b817ac4c92
Signed-off-by: Martin Roth <martinroth at google.com>
---
M src/mainboard/google/kahlee/variants/grunt/Makefile.inc
D src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc
R src/mainboard/google/kahlee/variants/spd/empty.spd.hex
R src/mainboard/google/kahlee/variants/spd/hynix-H5AN8G6NAFR-UH.spd.hex
R src/mainboard/google/kahlee/variants/spd/hynix-H5ANAG6NAMR-UH.spd.hex
R src/mainboard/google/kahlee/variants/spd/micron-MT40A1G16KNR-075:E.spd.hex
R src/mainboard/google/kahlee/variants/spd/micron-MT40A512M16JY-083E:B.spd.hex
R src/mainboard/google/kahlee/variants/spd/samsung-K4A8G165WB-BCRC.spd.hex
R src/mainboard/google/kahlee/variants/spd/samsung-K4AAG165WB-MCRC.spd.hex
9 files changed, 19 insertions(+), 36 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/26523/1

diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
index 3ef10b3..7734c0b 100644
--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
@@ -13,8 +13,25 @@
 # GNU General Public License for more details.
 #
 
-subdirs-y += spd
-
 romstage-y += romstage.c
 
 ramstage-y += mainboard.c
+
+LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/spd/$(f).spd.hex)
+
+SPD_SOURCES =  hynix-H5AN8G6NAFR-UH		# 0b0000
+SPD_SOURCES += hynix-H5ANAG6NAMR-UH		# 0b0001
+SPD_SOURCES += micron-MT40A512M16JY-083E:B	# 0b0010
+SPD_SOURCES += micron-MT40A1G16KNR-075:E	# 0b0011
+SPD_SOURCES += samsung-K4A8G165WB-BCRC		# 0b0100
+SPD_SOURCES += samsung-K4AAG165WB-MCRC		# 0b0101
+SPD_SOURCES += empty				# 0b0110
+SPD_SOURCES += empty				# 0b0111
+SPD_SOURCES += empty				# 0b1000
+SPD_SOURCES += empty				# 0b1001
+SPD_SOURCES += empty				# 0b1010
+SPD_SOURCES += empty				# 0b1011
+SPD_SOURCES += empty				# 0b1100
+SPD_SOURCES += empty				# 0b1101
+SPD_SOURCES += empty				# 0b1110
+SPD_SOURCES += empty				# 0b1111
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc
deleted file mode 100644
index 128edf0..0000000
--- a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2014 Google Inc.
-## Copyright (C) 2015 Intel Corporation.
-##
-## 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.
-##
-
-LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex)
-
-SPD_SOURCES =  hynix-H5AN8G6NAFR-UH		# 0b0000
-SPD_SOURCES += hynix-H5ANAG6NAMR-UH		# 0b0001
-SPD_SOURCES += micron-MT40A512M16JY-083E:B	# 0b0010
-SPD_SOURCES += micron-MT40A1G16KNR-075:E	# 0b0011
-SPD_SOURCES += samsung-K4A8G165WB-BCRC		# 0b0100
-SPD_SOURCES += samsung-K4AAG165WB-MCRC		# 0b0101
-SPD_SOURCES += empty				# 0b0110
-SPD_SOURCES += empty				# 0b0111
-SPD_SOURCES += empty				# 0b1000
-SPD_SOURCES += empty				# 0b1001
-SPD_SOURCES += empty				# 0b1010
-SPD_SOURCES += empty				# 0b1011
-SPD_SOURCES += empty				# 0b1100
-SPD_SOURCES += empty				# 0b1101
-SPD_SOURCES += empty				# 0b1110
-SPD_SOURCES += empty				# 0b1111
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex b/src/mainboard/google/kahlee/variants/spd/empty.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex
rename to src/mainboard/google/kahlee/variants/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/spd/hynix-H5AN8G6NAFR-UH.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex
rename to src/mainboard/google/kahlee/variants/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/spd/hynix-H5ANAG6NAMR-UH.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex
rename to src/mainboard/google/kahlee/variants/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/spd/micron-MT40A1G16KNR-075:E.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex
rename to src/mainboard/google/kahlee/variants/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/spd/micron-MT40A512M16JY-083E:B.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex
rename to src/mainboard/google/kahlee/variants/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/spd/samsung-K4A8G165WB-BCRC.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex
rename to src/mainboard/google/kahlee/variants/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/spd/samsung-K4AAG165WB-MCRC.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex
rename to src/mainboard/google/kahlee/variants/spd/samsung-K4AAG165WB-MCRC.spd.hex

-- 
To view, visit https://review.coreboot.org/26523
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53975a46a8c7d7e519bb6f7ef6ccd0b817ac4c92
Gerrit-Change-Number: 26523
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180524/7c140a6e/attachment.html>

More information about the coreboot-gerrit mailing list