build system: really disable building CrEC when not needed

Enable users to set the EC_EXTERNAL_FIRMWARE config flag, and actively
ignore anything related to EC firmware board names if enabled.

BUG=none
BRANCH=none
CQ-DEPEND=CL:344540
TEST=emerge-samus coreboot works

Change-Id: I39c3038d059ec3d7710b864061fcf83b8d6d4d13
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/345584
Reviewed-by: Aaron Durbin <adurbin@google.com>
Commit-Queue: Martin Roth <martinroth@chromium.org>
Trybot-Ready: Martin Roth <martinroth@chromium.org>
Tested-by: Martin Roth <martinroth@chromium.org>
This commit is contained in:
Patrick Georgi 2016-05-12 15:13:23 +02:00 committed by ChromeOS Commit Bot
parent a6e2cc4745
commit 4f0b6fd10a
2 changed files with 4 additions and 1 deletions

View file

@ -76,7 +76,8 @@ config EC_GOOGLE_CHROMEEC_SPI_CHIP
config EC_EXTERNAL_FIRMWARE
depends on EC_GOOGLE_CHROMEEC
def_bool n
bool "Disable building EC firmware"
default n
help
Disable building EC firmware if it's already built externally (and
added manually.)

View file

@ -27,6 +27,7 @@ smm-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += vboot_storage.c
romstage-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += vboot_storage.c
verstage-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += vboot_storage.c
ifneq ($(CONFIG_EC_EXTERNAL_FIRMWARE),y)
# These are Chrome EC firmware images that a payload (such as depthcharge) can
# use to update the EC. ecrw is the main embedded controller's firmware,
# pdrw is for a USB PD controller.
@ -64,5 +65,6 @@ $(obj)/mainboard/$(MAINBOARDDIR)/pdrw:
cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)/RW/ec.RW.flat $@
.PHONY: $(obj)/mainboard/$(MAINBOARDDIR)/ecrw $(obj)/mainboard/$(MAINBOARDDIR)/pdrw
endif
endif