Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15938
-gerrit
commit 42e8d5aa2a7bbbd3400544ea39c77e4d8810c3b8 Author: Patrick Georgi pgeorgi@google.com Date: Thu May 12 15:13:23 2016 +0200
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 --- src/ec/google/chromeec/Kconfig | 3 ++- src/ec/google/chromeec/Makefile.inc | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig index 0e1b4f2..4d5de32 100644 --- a/src/ec/google/chromeec/Kconfig +++ b/src/ec/google/chromeec/Kconfig @@ -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.) diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc index aeb950f..761ab7f 100644 --- a/src/ec/google/chromeec/Makefile.inc +++ b/src/ec/google/chromeec/Makefile.inc @@ -29,6 +29,7 @@ smm-$(CONFIG_VBOOT) += vboot_storage.c romstage-$(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 # use to update the EC. ecrw is the main embedded controller's firmware, # pdrw is for a USB PD controller. @@ -79,5 +80,6 @@ $(obj)/mainboard/$(MAINBOARDDIR)/%.hash: $(obj)/mainboard/$(MAINBOARDDIR)/% openssl dgst -sha256 -binary $< > $@
.PHONY: $(obj)/mainboard/$(MAINBOARDDIR)/ecrw $(obj)/mainboard/$(MAINBOARDDIR)/pdrw +endif
endif