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: I02aa1e4bc0c98300105b83a12979e9368a40cbcf
Signed-off-by: Martin Roth <martinroth@chromium.org>
Original-Commit-Id: 4f0b6fd10aa89fbb38bdebf14b8a82d52e9ee233
Original-Change-Id: I39c3038d059ec3d7710b864061fcf83b8d6d4d13
Original-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/345584
Original-Reviewed-by: Aaron Durbin <adurbin@google.com>
Original-Commit-Queue: Martin Roth <martinroth@chromium.org>
Original-Trybot-Ready: Martin Roth <martinroth@chromium.org>
Original-Tested-by: Martin Roth <martinroth@chromium.org>
Reviewed-on: https://review.coreboot.org/15938
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Patrick Georgi 2016-05-12 15:13:23 +02:00 committed by Martin Roth
parent 312e9f586a
commit 14caed85e1
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 config EC_EXTERNAL_FIRMWARE
depends on EC_GOOGLE_CHROMEEC depends on EC_GOOGLE_CHROMEEC
def_bool n bool "Disable building EC firmware"
default n
help help
Disable building EC firmware if it's already built externally (and Disable building EC firmware if it's already built externally (and
added manually.) added manually.)

View File

@ -29,6 +29,7 @@ smm-$(CONFIG_VBOOT) += vboot_storage.c
romstage-$(CONFIG_VBOOT) += vboot_storage.c romstage-$(CONFIG_VBOOT) += vboot_storage.c
verstage-$(CONFIG_VBOOT) += vboot_storage.c verstage-$(CONFIG_VBOOT) += vboot_storage.c
ifneq ($(CONFIG_EC_EXTERNAL_FIRMWARE),y)
# These are Chrome EC firmware images that a payload (such as depthcharge) can # 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, # use to update the EC. ecrw is the main embedded controller's firmware,
# pdrw is for a USB PD controller. # pdrw is for a USB PD controller.
@ -79,5 +80,6 @@ $(obj)/mainboard/$(MAINBOARDDIR)/%.hash: $(obj)/mainboard/$(MAINBOARDDIR)/%
openssl dgst -sha256 -binary $< > $@ openssl dgst -sha256 -binary $< > $@
.PHONY: $(obj)/mainboard/$(MAINBOARDDIR)/ecrw $(obj)/mainboard/$(MAINBOARDDIR)/pdrw .PHONY: $(obj)/mainboard/$(MAINBOARDDIR)/ecrw $(obj)/mainboard/$(MAINBOARDDIR)/pdrw
endif
endif endif