From fa97970e85b40ae9a6cb9ec8521ce1aa6eb9e8e3 Mon Sep 17 00:00:00 2001 From: Cliff Huang Date: Thu, 22 Feb 2024 15:45:26 -0800 Subject: 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 Change-Id: Icca10aa770b7b7a6e010f58bcf1e4f0a3401681a Reviewed-on: https://review.coreboot.org/c/coreboot/+/80726 Reviewed-by: Bora Guvendik Tested-by: build bot (Jenkins) Reviewed-by: Wonkyu Kim Reviewed-by: Nico Huber Reviewed-by: Zhixing Ma --- payloads/external/Makefile.mk | 2 ++ payloads/external/depthcharge/Kconfig | 12 ++++++++++++ payloads/external/depthcharge/Makefile | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index c87f140da4..f1dc5cc4ad 100644 --- a/payloads/external/Makefile.mk +++ b/payloads/external/Makefile.mk @@ -146,6 +146,8 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D $(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 c531aa05b8..86b20abcaf 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -26,6 +26,18 @@ config DEPTHCHARGE_REVISION 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 e3e2303faf..af303da872 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -3,7 +3,7 @@ STABLE_COMMIT_ID=c48613a71c1ee29295b184c51fe5dadf71b543c4 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 @@ coreboot_build_dir=$(abspath $(CURDIR)/../../../build) 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) -- cgit v1.2.3