summaryrefslogtreecommitdiff
path: root/payloads/external
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2016-12-22 18:16:48 -0500
committerMartin Roth <martinroth@google.com>2017-02-01 20:15:04 +0100
commitf9973b5c2bf9ec09c72579e152a2aefee3b6dd85 (patch)
tree6e9837ba9c448fbe2ac026d1719a6d510f6178c2 /payloads/external
parent8f470c7a7ef78266564403f46543737b400d8be6 (diff)
downloadcoreboot-f9973b5c2bf9ec09c72579e152a2aefee3b6dd85.tar.xz
payloads/depthcharge: Specify revision to build
Add the capability for specifying which version of depthcharge to checkout and build. This is similar to the existing feature for SeaBIOS. The depthcharge makefile already contains some structure for checking out master vs. stable however the calling Makefile.inc ingored this feature. Add the command-line variable assignment for these, along with a tree-ish for any revision. Change-Id: I99a5b088cb0ebb29e5d96a84217b3bfa852de8ac Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/18270 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'payloads/external')
-rw-r--r--payloads/external/Makefile.inc7
-rw-r--r--payloads/external/depthcharge/Kconfig31
-rw-r--r--payloads/external/depthcharge/Makefile1
3 files changed, 37 insertions, 2 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 078e63af87..d159da9453 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -103,10 +103,13 @@ endif
# Depthcharge
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL)
-
$(MAKE) -C payloads/external/depthcharge \
BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \
- MFLAGS= MAKEFLAGS=
+ MFLAGS= MAKEFLAGS= \
+ DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \
+ DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \
+ DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \
+ DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID)
# FILO
diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig
index 84b36e5a99..d6ce5388ef 100644
--- a/payloads/external/depthcharge/Kconfig
+++ b/payloads/external/depthcharge/Kconfig
@@ -1,5 +1,36 @@
if PAYLOAD_DEPTHCHARGE
+choice
+prompt "Depthcharge version"
+
+config DEPTHCHARGE_STABLE
+ bool "stable"
+ help
+ Latest stable version.
+
+config DEPTHCHARGE_MASTER
+ bool "master"
+ help
+ Newest Depthcharge version.
+
+config DEPTHCHARGE_REVISION
+ bool "git revision"
+ help
+ Select this option if you have a specific commit or branch that
+ you want to use as the revision from which to build Depthcharge.
+
+ You will be able to specify the name of a branch or a commit SHA
+ later.
+
+endchoice
+
+config DEPTHCHARGE_REVISION_ID
+ string "Insert a commit's SHA-1 or a branch name"
+ depends on DEPTHCHARGE_REVISION
+ default "origin/master"
+ help
+ The commit's SHA-1 or branch name of the revision to use.
+
config PAYLOAD_FILE
string
default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf"
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile
index 89db11193c..97d095032a 100644
--- a/payloads/external/depthcharge/Makefile
+++ b/payloads/external/depthcharge/Makefile
@@ -13,6 +13,7 @@ VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot)
TAG-$(DEPTHCHARGE_MASTER)=origin/master
TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID)
+TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID)
# todo: consider reverting this once stable moves past the commit below
payload_target=depthcharge