From 089aa95b6c707734820882a17d1debcd04ac3edc Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 2 Aug 2016 15:32:51 -0600 Subject: [PATCH] UPSTREAM: google/chromeec: Enable/Disable ccache with config variable If the CONFIG_CCACHE variable is NOT set, define the CCACHE variable as blank on the Chrome EC make command line. This will overrride and disable the CCACHE variable in the Chrome EC makefile. BUG=None BRANCH=None TEST=None Change-Id: I9492b3af2d6cb746ec285f0bc00bba019229fa17 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/16035 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-on: https://chromium-review.googlesource.com/368783 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/ec/google/chromeec/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc index 761ab7f587..879a560939 100644 --- a/src/ec/google/chromeec/Makefile.inc +++ b/src/ec/google/chromeec/Makefile.inc @@ -59,7 +59,7 @@ pdrw.hash-type := raw CHROMEEC_SOURCE ?= $(top)/3rdparty/chromeec $(obj)/mainboard/$(MAINBOARDDIR)/ecrw: - $(MAKE) -C $(CHROMEEC_SOURCE) \ + $(MAKE) -C $(CHROMEEC_SOURCE) $(if $(CONFIG_CCACHE),,CCACHE=) \ out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)) \ CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ HOST_CROSS_COMPILE= \ @@ -68,7 +68,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/ecrw: cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)/RW/ec.RW.flat $@ $(obj)/mainboard/$(MAINBOARDDIR)/pdrw: - $(MAKE) -C $(CHROMEEC_SOURCE) \ + $(MAKE) -C $(CHROMEEC_SOURCE) $(if $(CONFIG_CCACHE),,CCACHE=) \ out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)) \ CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ HOST_CROSS_COMPILE= \