summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2018-05-28 17:09:40 -0600
committerMartin Roth <martinroth@google.com>2018-05-30 14:29:27 +0000
commitf6081c2deb6cb0bf07634185630f9a94ab5cbbb8 (patch)
tree7e6760bbd8e3a1255dcae4178a356bd2e52e2e2a /src
parentddb2a77511f8fc20c0de3bd29161467ed224c01e (diff)
downloadcoreboot-f6081c2deb6cb0bf07634185630f9a94ab5cbbb8.tar.xz
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@google.com> Reviewed-on: https://review.coreboot.org/26656 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/kahlee/Kconfig3
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd (renamed from src/mainboard/google/kahlee/variants/grunt/chromeos.fmd)0
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 24881b57d0..0161fa11cc 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -64,7 +64,8 @@ config MAINBOARD_FAMILY
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
index 336aced7f2..336aced7f2 100644
--- a/src/mainboard/google/kahlee/variants/grunt/chromeos.fmd
+++ b/src/mainboard/google/kahlee/variants/baseboard/chromeos.fmd