summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2016-07-24 12:14:38 +0200
committerPatrick Georgi <pgeorgi@google.com>2016-08-08 12:17:00 +0200
commit61486b506d5f3be1ea02aa82df290bd7c18b1fda (patch)
tree1f769d59eec95dba1740cd5316929fbce3c84c1c /payloads
parent5d4194978275c2e3acf09788f80887023ca9ffe8 (diff)
downloadcoreboot-61486b506d5f3be1ea02aa82df290bd7c18b1fda.tar.xz
Use VBOOT_SOURCE instead of hardcoding vboot path
This replaces all occurrences of a hardcoded vboot path to the VBOOT_SOURCE variable, that may be overridden from the command line, witch fallback to the source from 3rdparty. Change-Id: Ia57d498d38719cc71e17060b76b0162c4ab363ed Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-on: https://review.coreboot.org/15825 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/external/depthcharge/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile
index cf2d0a1cca..edc48f8ecb 100644
--- a/payloads/external/depthcharge/Makefile
+++ b/payloads/external/depthcharge/Makefile
@@ -8,7 +8,8 @@ project_config_file=$(project_dir)/.config
output_dir=$(project_dir)/build
libpayload_dir=$(abspath $(CURDIR)/../../libpayload)
libpayload_install_dir=$(output_dir)/lp_$(BOARD)
-vboot_dir=$(abspath $(CURDIR)/../../../3rdparty/vboot)
+
+VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot)
TAG-$(DEPTHCHARGE_MASTER)=origin/master
TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID)
@@ -55,12 +56,12 @@ config: $(libpayload_install_dir) checkout
git describe --tags --long --dirty 2>/dev/null || \
echo "unknown") ; \
cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \
- VB_SOURCE=$(vboot_dir) defconfig
+ VB_SOURCE=$(VBOOT_SOURCE) defconfig
build: config
echo " MAKE $(project_name) $(TAG-y)"
cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \
- VB_SOURCE=$(vboot_dir) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified
+ VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified
clean:
test -d $(output_dir) && rm -rf $(output_dir) || exit 0