From ddb2a77511f8fc20c0de3bd29161467ed224c01e Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 24 May 2018 16:34:31 -0600 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/26523 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- .../kahlee/variants/{grunt => baseboard}/spd/Makefile.inc | 2 +- .../kahlee/variants/{grunt => baseboard}/spd/empty.spd.hex | 0 .../{grunt => baseboard}/spd/hynix-H5AN8G6NAFR-UH.spd.hex | 0 .../{grunt => baseboard}/spd/hynix-H5ANAG6NAMR-UH.spd.hex | 0 .../{grunt => baseboard}/spd/micron-MT40A1G16KNR-075:E.spd.hex | 0 .../spd/micron-MT40A512M16JY-083E:B.spd.hex | 0 .../{grunt => baseboard}/spd/samsung-K4A8G165WB-BCRC.spd.hex | 0 .../{grunt => baseboard}/spd/samsung-K4AAG165WB-MCRC.spd.hex | 0 src/mainboard/google/kahlee/variants/grunt/Makefile.inc | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/Makefile.inc (96%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/empty.spd.hex (100%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/hynix-H5AN8G6NAFR-UH.spd.hex (100%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/hynix-H5ANAG6NAMR-UH.spd.hex (100%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/micron-MT40A1G16KNR-075:E.spd.hex (100%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/micron-MT40A512M16JY-083E:B.spd.hex (100%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/samsung-K4A8G165WB-BCRC.spd.hex (100%) rename src/mainboard/google/kahlee/variants/{grunt => baseboard}/spd/samsung-K4AAG165WB-MCRC.spd.hex (100%) diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc similarity index 96% rename from src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc rename to 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 similarity index 100% rename from src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex rename to 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 similarity index 100% rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex rename to 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 similarity index 100% rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex rename to 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 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/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 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/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 similarity index 100% rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex rename to 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 similarity index 100% rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex rename to 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