diff options
| author | Meera Ravindranath <meera.ravindranath@intel.com> | 2021-03-05 16:03:36 +0530 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-04-15 10:54:27 +0000 |
| commit | 5c9bacca32c4554db0d2f04d371525c20488fac4 (patch) | |
| tree | 3ef3a82a87e5c973e4003a58650bbea75fcd6085 /payloads/external/depthcharge | |
| parent | 31316cfccaa3991e443ce1ddcdd7e49486fa7101 (diff) | |
payloads/external/dc: Update depthcharge branch from master to main
Signed-off-by: Meera Ravindranath <meera.ravindranath@intel.com>
Signed-off-by: Balaji Manigandan B <balaji.manigandan@intel.com>
Change-Id: Ice0b908b23921cd9afbef52d2471f5ded277a136
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51280
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Selma Bensaid <selma.bensaid@intel.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/external/depthcharge')
| -rw-r--r-- | payloads/external/depthcharge/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile index 60aa92d55c..d7a4b59379 100644 --- a/payloads/external/depthcharge/Makefile +++ b/payloads/external/depthcharge/Makefile @@ -12,7 +12,7 @@ libpayload_install_dir=$(output_dir)/lp_$(BOARD) VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot) EC_HEADERS ?= $(abspath $(CURDIR)/../../../3rdparty/chromeec/include) -TAG-$(DEPTHCHARGE_MASTER)=origin/master +TAG-$(DEPTHCHARGE_MASTER)=origin/main TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID) TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID) @@ -44,17 +44,17 @@ fetch: $(project_dir) @cd $(project_dir); \ git show $(TAG-y) >/dev/null 2>&1; \ if [ $$? -ne 0 ] || \ - [ "$(TAG-y)" = "origin/master" ]; then \ + [ "$(TAG-y)" = "origin/main" ]; then \ echo " Fetching new commits from the $(project_name) git repo"; \ git fetch; fi # Check out the requested version of the tree -# Don't write a file for master branch so the latest remote version is always used +# Don't write a file for main branch so the latest remote version is always used $(project_dir)/.version_$(TAG-y): fetch echo " Checking out $(project_name) revision $(TAG-y)" rm -f $(project_dir)/.version_* cd $(project_dir); \ - git checkout master; \ + git checkout main; \ git branch -D coreboot 2>/dev/null; \ git checkout -b coreboot $(TAG-y) ifneq ($(DEPTHCHARGE_MASTER),y) |