summaryrefslogtreecommitdiffstats
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-10 05:39:18 +0000
commit3ec21b07fb9cb27f76ce515d265d7f73d66ba08a (patch)
treeaeedcfbdac12fcc7770605f6430684b85a512a38
parent463aee755ed1ac94c8c433fcfad6302cf37f22fb (diff)
downloadcoreboot-3ec21b07fb9cb27f76ce515d265d7f73d66ba08a.tar.gz
coreboot-3ec21b07fb9cb27f76ce515d265d7f73d66ba08a.tar.bz2
coreboot-3ec21b07fb9cb27f76ce515d265d7f73d66ba08a.zip
.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/+/55305 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Mario Scheithauer <mario.scheithauer@siemens.com> Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 010ab6b49dfe..1b47275290a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,6 +34,7 @@
url = ../intel-microcode.git
update = none
ignore = dirty
+ branch = main
[submodule "3rdparty/ffs"]
path = 3rdparty/ffs
url = ../ffs.git