GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Meera Ravindranath 2021-03-05 16:03:36 +05:30 committed by Patrick Georgi
parent 31316cfcca
commit 5c9bacca32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
payloads/external/depthcharge/Makefile vendored
View File

@ -12,7 +12,7 @@ libpayload_install_dir=$(output_dir)/lp_$(BOARD)
VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot) VBOOT_SOURCE ?= $(abspath $(CURDIR)/../../../3rdparty/vboot)
EC_HEADERS ?= $(abspath $(CURDIR)/../../../3rdparty/chromeec/include) 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_STABLE)=$(STABLE_COMMIT_ID)
TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID) TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID)
@ -44,17 +44,17 @@ fetch: $(project_dir)
@cd $(project_dir); \ @cd $(project_dir); \
git show $(TAG-y) >/dev/null 2>&1; \ git show $(TAG-y) >/dev/null 2>&1; \
if [ $$? -ne 0 ] || \ if [ $$? -ne 0 ] || \
[ "$(TAG-y)" = "origin/master" ]; then \ [ "$(TAG-y)" = "origin/main" ]; then \
echo " Fetching new commits from the $(project_name) git repo"; \ echo " Fetching new commits from the $(project_name) git repo"; \
git fetch; fi git fetch; fi
# Check out the requested version of the tree # 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 $(project_dir)/.version_$(TAG-y): fetch
echo " Checking out $(project_name) revision $(TAG-y)" echo " Checking out $(project_name) revision $(TAG-y)"
rm -f $(project_dir)/.version_* rm -f $(project_dir)/.version_*
cd $(project_dir); \ cd $(project_dir); \
git checkout master; \ git checkout main; \
git branch -D coreboot 2>/dev/null; \ git branch -D coreboot 2>/dev/null; \
git checkout -b coreboot $(TAG-y) git checkout -b coreboot $(TAG-y)
ifneq ($(DEPTHCHARGE_MASTER),y) ifneq ($(DEPTHCHARGE_MASTER),y)