From 8d3ca5e0baee6fa6bfccc1d118e89a159f88dca0 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Wed, 20 Jul 2016 18:38:54 +0200 Subject: [PATCH] UPSTREAM: chromeec: Use CHROMEEC_SOURCE with fallback instead of hardcoding path This introduces a CHROMEEC_SOURCE variable used for indicating the CrOS EC source path, with a fallback to 3rdparty/chromeec. This allows specifying an external path for the CrOS EC source path. BUG=None BRANCH=None TEST=None Signed-off-by: Paul Kocialkowski Reviewed-on: https://review.coreboot.org/15765 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi Change-Id: I9792c7f21597127a385b961b65a00d44cfa37146 Reviewed-on: https://chromium-review.googlesource.com/363937 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Duncan Laurie --- src/ec/google/chromeec/Makefile.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc index 93ffe8f448..590ad114c1 100644 --- a/src/ec/google/chromeec/Makefile.inc +++ b/src/ec/google/chromeec/Makefile.inc @@ -54,8 +54,10 @@ pdrw.hash-file := $(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash pdrw.hash-name := pdrw.hash pdrw.hash-type := raw +CHROMEEC_SOURCE ?= $(top)/3rdparty/chromeec + $(obj)/mainboard/$(MAINBOARDDIR)/ecrw: - $(MAKE) -C $(top)/3rdparty/chromeec \ + $(MAKE) -C $(CHROMEEC_SOURCE) \ out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)) \ CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ HOST_CROSS_COMPILE= \ @@ -64,7 +66,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/ecrw: cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)/RW/ec.RW.flat $@ $(obj)/mainboard/$(MAINBOARDDIR)/pdrw: - $(MAKE) -C $(top)/3rdparty/chromeec \ + $(MAKE) -C $(CHROMEEC_SOURCE) \ out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)) \ CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ HOST_CROSS_COMPILE= \