[coreboot-gerrit] Change in coreboot[master]: mainboard/google/kahlee: move grunt's chromeos.fmd to baseboard

[Martin Roth (Code Review)]

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


Change subject: mainboard/google/kahlee: move grunt's chromeos.fmd to baseboard
......................................................................

mainboard/google/kahlee: move grunt's chromeos.fmd to baseboard

The chrmoeos.fmd file will be common across variants, so move it out of
of grunt directory and into the variants/baseboard directory.

BUG=b:80106042
TEST=Build grunt

Change-Id: I259d85f60c5e19e00f7d9149542bcfdcc6dfaf4f
Signed-off-by: Martin Roth <martinroth at google.com>
---
M src/mainboard/google/kahlee/Kconfig
R src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
2 files changed, 2 insertions(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/26656/1

diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 24881b5..0161fa1 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -64,7 +64,8 @@
 
 config FMDFILE
 	string
-	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/$(CONFIG_VARIANT_DIR)/chromeos.fmd" if CHROMEOS && BOARD_GOOGLE_KAHLEE
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS
 	default ""
 	help
 	  The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
diff --git a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/chromeos.fmd
rename to src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd

-- 
To view, visit https://review.coreboot.org/26656
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: I259d85f60c5e19e00f7d9149542bcfdcc6dfaf4f
Gerrit-Change-Number: 26656
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/20180528/79a2096a/attachment.html>