1 files changed, 22 insertions, 15 deletions
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index e7e01212..4692a254 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -167,21 +167,6 @@ endif
 
 endchoice
 
-#!if [ -n "@@all_versions@@" ]
-config @@pfx@@_MIRRORS
-    string
-    default "@@mirrors@@"
-
-config @@pfx@@_ARCHIVE_FILENAME
-    string
-    default "@@archive_filename@@"
-
-config @@pfx@@_ARCHIVE_DIRNAME
-    string
-    default "@@archive_dirname@@"
-
-#!end-if
-
 #!// Below, we explicitly select all milestones to which a given version
 #!// compares greater-or-equal. We don't select just the latest applicable
 #!// (and letting milestones chain-select each other, with FOO_6_or_later
@@ -260,6 +245,28 @@ config @@pfx@@_VERSION
 #!end-foreach
     default "unknown"
 
+#!if [ -n "@@all_versions@@" ]
+config @@pfx@@_MIRRORS
+    string
+    default "@@mirrors@@"
+
+config @@pfx@@_ARCHIVE_FILENAME
+    string
+    default "@@archive_filename@@"
+
+config @@pfx@@_ARCHIVE_DIRNAME
+    string
+    default "@@archive_dirname@@"
+
+config @@pfx@@_ARCHIVE_FORMATS
+    string
+#!foreach version
+    default "@@archive_formats@@" if @@pfx@@_V_@@kcfg@@
+#!end-foreach
+    default "@@archive_formats@@"
+
+#!end-if
+
 #!if [ "@@nforks@@" -ge 2 ]
 endif
 #!end-if