summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorBalaji Manigandan B <balaji.manigandan@intel.com>2021-04-26 09:28:51 +0530
committerFelix Held <felix-coreboot@felixheld.de>2021-04-28 16:33:07 +0000
commit8aef56ab3b5931aa417c5fa90f239ca9ac73d2ef (patch)
treef1a24433398892f699e90adaa6a9be3710938086 /.gitmodules
parent985009ad140698f92dc0fdf47622e2f759f13e6a (diff)
.gitmodules: update vboot submodule to track branch=main
vboot has been updated to track main branch, however the .gitmodules defaults to master branch following the coreboot default. This impacts the rebase of submodule git submodule update --remote --rebase 3rdparty/vboot/ With this change the rebase to latest commit is successful Signed-off-by: Balaji Manigandan B <balaji.manigandan@intel.com> Change-Id: I7713aecdec43a5d5623ef81803ac0fc02ce14070 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52664 Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 4350a2c9b5..d798fd5030 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,6 +9,7 @@
[submodule "vboot"]
path = 3rdparty/vboot
url = ../vboot.git
+ branch = main
[submodule "arm-trusted-firmware"]
path = 3rdparty/arm-trusted-firmware
url = ../arm-trusted-firmware.git