From 5c9bacca32c4554db0d2f04d371525c20488fac4 Mon Sep 17 00:00:00 2001 From: Meera Ravindranath Date: Fri, 5 Mar 2021 16:03:36 +0530 Subject: payloads/external/dc: Update depthcharge branch from master to main Signed-off-by: Meera Ravindranath Signed-off-by: Balaji Manigandan B Change-Id: Ice0b908b23921cd9afbef52d2471f5ded277a136 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51280 Tested-by: build bot (Jenkins) Reviewed-by: Selma Bensaid Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- payloads/external/depthcharge/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'payloads') 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) -- cgit v1.2.3