From bc1445392fd021f7729e4d5f7e2c4639f1f64cf5 Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Tue, 8 Jun 2021 09:49:19 +0200 Subject: [PATCH] .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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55304 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) Tested-by: siemens-bot --- .gitmodules | 1 + 1 file changed, 1 insertion(+) 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 -- 2.11.4.GIT