summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Zeh <werner.zeh@siemens.com>2021-06-08 09:49:19 +0200
committerPatrick Georgi <pgeorgi@google.com>2021-06-09 17:20:50 +0000
commitbc1445392fd021f7729e4d5f7e2c4639f1f64cf5 (patch)
treebe9bf80da13b700e48b3dea241165ac5da5a9026
parentf892b85e18bfead6ed1f135e50ed4e9544553278 (diff)
downloadcoreboot-bc1445392fd021f7729e4d5f7e2c4639f1f64cf5.tar.gz
.gitmodules: Update intel-microcode submodule to track branch=main
The 3rdparty submodule 'intel-microcode' has changed the branch from 'master' to 'main'. As we do not set any specific branch name in our config, it defaults to 'master' which makes "git submodule update --remote --rebase 3rdparty/intel-microcode" to fail. This patch adds the branch name in .gitmodules to match the upstream name. Change-Id: I7b6d7921a21af4eb3bcc7ce4e5a8ea21c38c89a3 Signed-off-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/55304 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Tested-by: siemens-bot
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index d798fd5030..68230b92ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,6 +35,7 @@
url = ../intel-microcode.git
update = none
ignore = dirty
+ branch = main
[submodule "3rdparty/ffs"]
path = 3rdparty/ffs
url = ../ffs.git