Felix Singer submitted this change.
payloads/depthcharge: Add DEPTHCHARGE_REPO and DEPTHCHARGE_BRANCH
Move hard-coded repo and repo name to Kconfig as default value
DEPTHCHARGE_REPO default to:
https://chromium.googlesource.com/chromiumos/platform/depthcharge
DEPTHCHARGE_BRANCH default to:
origin/main
When DEPTHCHARGE_MASTER=y, DEPTHCHARGE_BRANCH can be used to point
out a particular branch.
This change enable to use mirrored internal depthcharge repo and
branch for early SOC development (before upstreaming SOC and
dephthcharge code).
TEST=Build coreboot and check the repo remote link from:
payloads/external/depthcharge/depthcharge
Signed-off-by: Cliff Huang <cliff.huang@intel.com>
Change-Id: Icca10aa770b7b7a6e010f58bcf1e4f0a3401681a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80726
Reviewed-by: Bora Guvendik <bora.guvendik@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Zhixing Ma <zhixing.ma@intel.com>
---
M payloads/external/Makefile.mk
M payloads/external/depthcharge/Kconfig
M payloads/external/depthcharge/Makefile
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk
index c87f140..f1dc5cc 100644
--- a/payloads/external/Makefile.mk
+++ b/payloads/external/Makefile.mk
@@ -146,6 +146,8 @@
$(MAKE) -C payloads/external/depthcharge \
BOARD=$(BOARD) \
MFLAGS= MAKEFLAGS= \
+ DEPTHCHARGE_REPO=$(CONFIG_DEPTHCHARGE_REPO) \
+ DEPTHCHARGE_BRANCH=$(CONFIG_DEPTHCHARGE_BRANCH) \
DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \
DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \
DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \
diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig
index c531aa0..86b20ab 100644
--- a/payloads/external/depthcharge/Kconfig
+++ b/payloads/external/depthcharge/Kconfig
@@ -26,6 +26,18 @@
endchoice
+config DEPTHCHARGE_REPO
+ string "depthcharge repo site"
+ default "https://chromium.googlesource.com/chromiumos/platform/depthcharge"
+ help
+ repo site
+
+config DEPTHCHARGE_BRANCH
+ string "branch from the depthcharge repo"
+ default "origin/main"
+ help
+ repo branch name
+
config DEPTHCHARGE_REVISION_ID
string "Insert a commit's SHA-1 or a branch name"
depends on DEPTHCHARGE_REVISION
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile
index e3e2303..af303da 100644
--- a/payloads/external/depthcharge/Makefile
+++ b/payloads/external/depthcharge/Makefile
@@ -3,7 +3,7 @@
project_name=depthcharge
project_dir=$(CURDIR)/depthcharge
-project_git_repo=https://chromium.googlesource.com/chromiumos/platform/depthcharge
+project_git_repo=$(DEPTHCHARGE_REPO)
project_config_file=$(project_dir)/.config
output_dir=$(project_dir)/build
libpayload_dir=$(abspath $(CURDIR)/../../libpayload)
@@ -13,7 +13,7 @@
VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot)
EC_HEADERS ?= $(abspath $(CURDIR)/../../../3rdparty/chromeec/include)
-TAG-$(DEPTHCHARGE_MASTER)=origin/main
+TAG-$(DEPTHCHARGE_MASTER)=$(DEPTHCHARGE_BRANCH)
TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID)
TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID)
To view, visit change 80726. To unsubscribe, or for help writing mail filters, visit settings.