<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26523">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/grunt: move SPDs to variants/spd<br><br>The SPD files will be common to many of the mainboards, so move them out<br>of grunt and into the variants directory.<br>Keep the Makefile including the SPDs in Grunt.<br><br>BUG=b:80106042<br>TEST=Build grunt, make sure spd.bin is the same.<br><br>Change-Id: I53975a46a8c7d7e519bb6f7ef6ccd0b817ac4c92<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/variants/grunt/Makefile.inc<br>D src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc<br>R src/mainboard/google/kahlee/variants/spd/empty.spd.hex<br>R src/mainboard/google/kahlee/variants/spd/hynix-H5AN8G6NAFR-UH.spd.hex<br>R src/mainboard/google/kahlee/variants/spd/hynix-H5ANAG6NAMR-UH.spd.hex<br>R src/mainboard/google/kahlee/variants/spd/micron-MT40A1G16KNR-075:E.spd.hex<br>R src/mainboard/google/kahlee/variants/spd/micron-MT40A512M16JY-083E:B.spd.hex<br>R src/mainboard/google/kahlee/variants/spd/samsung-K4A8G165WB-BCRC.spd.hex<br>R src/mainboard/google/kahlee/variants/spd/samsung-K4AAG165WB-MCRC.spd.hex<br>9 files changed, 19 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/26523/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>index 3ef10b3..7734c0b 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>@@ -13,8 +13,25 @@</span><br><span> # GNU General Public License for more details.</span><br><span> #</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-subdirs-y += spd</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> romstage-y += romstage.c</span><br><span> </span><br><span> ramstage-y += mainboard.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/spd/$(f).spd.hex)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += micron-MT40A512M16JY-083E:B # 0b0010</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += micron-MT40A1G16KNR-075:E # 0b0011</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b0110</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b0111</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1000</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1001</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1010</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1011</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1100</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1101</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1110</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += empty # 0b1111</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc</span><br><span>deleted file mode 100644</span><br><span>index 128edf0..0000000</span><br><span>--- a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc</span><br><span>+++ /dev/null</span><br><span>@@ -1,34 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-##</span><br><span style="color: hsl(0, 100%, 40%);">-## This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">-##</span><br><span style="color: hsl(0, 100%, 40%);">-## Copyright (C) 2014 Google Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-## Copyright (C) 2015 Intel Corporation.</span><br><span style="color: hsl(0, 100%, 40%);">-##</span><br><span style="color: hsl(0, 100%, 40%);">-## This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">-## it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">-## the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">-##</span><br><span style="color: hsl(0, 100%, 40%);">-## This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">-## but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">-## GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-##</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += micron-MT40A512M16JY-083E:B # 0b0010</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += micron-MT40A1G16KNR-075:E # 0b0011</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b0110</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b0111</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1000</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1001</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1010</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1011</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1100</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1101</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1110</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += empty # 0b1111</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex b/src/mainboard/google/kahlee/variants/spd/empty.spd.hex</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/empty.spd.hex</span><br><span>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</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/hynix-H5AN8G6NAFR-UH.spd.hex</span><br><span>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</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/hynix-H5ANAG6NAMR-UH.spd.hex</span><br><span>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</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/micron-MT40A1G16KNR-075:E.spd.hex</span><br><span>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</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/micron-MT40A512M16JY-083E:B.spd.hex</span><br><span>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</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/samsung-K4A8G165WB-BCRC.spd.hex</span><br><span>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</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex</span><br><span>rename to src/mainboard/google/kahlee/variants/spd/samsung-K4AAG165WB-MCRC.spd.hex</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26523">change 26523</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26523"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I53975a46a8c7d7e519bb6f7ef6ccd0b817ac4c92 </div>
<div style="display:none"> Gerrit-Change-Number: 26523 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>