Marshall Dawson (marshalldawson3rd@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18270
-gerrit
commit 03211e2ab9edfd902889c849111c7087d24fb4af Author: Marshall Dawson marshalldawson3rd@gmail.com Date: Thu Dec 22 18:16:48 2016 -0500
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 --- payloads/external/Makefile.inc | 7 +++++-- payloads/external/depthcharge/Kconfig | 31 +++++++++++++++++++++++++++++++ payloads/external/depthcharge/Makefile | 1 + 3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 29163d0..d09305c 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -102,10 +102,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 84b36e5..d6ce538 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 89db111..97d0950 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