git.sh fix: only download submodules for coreboot

In practise, both cbmk and lbmk only need coreboot submodules,
but the pico sources download them too, and some of them may
not be FSDG compatible.

So, this change will be Canoeboot-specific, and only download
submodules for coreboot as a result.

The required submodules are defined already in config/git,
so pico-serprog and stm32-vserprog will work just fine.

To be sure: this patch restores behaviour from Canoeboot at
release 20231107. Canoeboot inherited some improvements from
lbmk and I forgot to adapt the code for this. This behaviour
is intentional, as part of Canoeboot's design.

Signed-off-by: Leah Rowe <info@minifree.org>

config/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode

@@ -297,8 +297,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode

@@ -297,8 +297,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode

@@ -297,8 +297,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode

@@ -297,8 +297,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode

@@ -293,8 +293,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode

@@ -293,8 +293,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode

@@ -300,8 +300,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode

@@ -300,8 +300,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode

@@ -300,8 +300,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

config/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode

@@ -300,8 +300,9 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
 CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge

include/git.sh

@@ -104,7 +104,7 @@ git_prep()
 	git -C "$tmpgit" reset --hard $rev || $err "git -C $_loc: !reset $rev"
 	git_am_patches "$tmpgit" "$_patchdir" || $err "!am $_loc $_patchdir"
 
-	if [ "$project" != "coreboot" ] || [ $# -gt 2 ]; then
+	if [ "$project" = "coreboot" ] && [ $# -gt 2 ]; then
 		[ ! -f "$tmpgit/.gitmodules" ] || git -C "$tmpgit" submodule \
 		    update --init || $err "git_prep $_loc: !submod"
 		if [ "$project" = "coreboot" ] && [ -n "$xtree" ] && \