1 files changed, 35 insertions, 16 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 5ea5c71c70..ede1825f88 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -868,22 +868,41 @@ Lyre prototype 1 */
 #define CONFIG_STORAGE_MULTI
 #endif
 
-/* Explicit HAVE_MULTIVOLUME in the config file. Allow the maximum number */
-#ifdef HAVE_MULTIVOLUME
-#define NUM_VOLUMES_PER_DRIVE 4
-#else
-#define NUM_VOLUMES_PER_DRIVE 1
-#endif
 #if defined(CONFIG_STORAGE_MULTI) && !defined(HAVE_MULTIDRIVE)
 #define HAVE_MULTIDRIVE
 #endif
 
-#if defined(HAVE_MULTIDRIVE) && !defined(HAVE_MULTIVOLUME)
+#if defined(HAVE_MULTIDRIVE) && !defined(NUM_DRIVES)
+#error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES
+#endif
+
+#ifndef NUM_DRIVES
+#define NUM_DRIVES 1
+#endif
+
+#if !defined(HAVE_MULTIVOLUME)
+#if defined(HAVE_MULTIDRIVE)
+/* Multidrive strongly implies multivolume */
+#define HAVE_MULTIVOLUME
+#elif (CONFIG_STORAGE & STORAGE_SD)
+/* SD routinely have multiple partitions */
+#elif (CONFIG_STORAGE & STORAGE_ATA) && defined(HAVE_LBA48)
+/* ATA routinely haves multiple partitions, but don't bother if we can't do LBA48 */
 #define HAVE_MULTIVOLUME
 #endif
+#endif
 
-#if defined(HAVE_MULTIDRIVE) && !defined(NUM_DRIVES)
-#error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES
+/* Bootloaders don't need multivolume awareness */
+#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) \
+    && !(CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(BOOT_REDIR)
+#undef HAVE_MULTIVOLUME
+#endif
+
+/* Number of volumes per drive */
+#if defined(HAVE_MULTIVOLUME) && !defined(SIMULATOR) && !(CONFIG_PLATFORM & PLATFORM_HOSTED)
+#define NUM_VOLUMES_PER_DRIVE 4
+#else
+#define NUM_VOLUMES_PER_DRIVE 1
 #endif
 
 /* note to remove multi-partition booting this could be changed to MULTIDRIVE */
@@ -897,10 +916,6 @@ Lyre prototype 1 */
 # define MULTIBOOT_MIN_VOLUME 0
 #endif
 
-#ifndef NUM_DRIVES
-#define NUM_DRIVES 1
-#endif
-
 #define NUM_VOLUMES (NUM_DRIVES * NUM_VOLUMES_PER_DRIVE)
 
 #if defined(BOOTLOADER) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
@@ -934,31 +949,35 @@ Lyre prototype 1 */
 #ifdef HAVE_BOOTLOADER_USB_MODE
 /* Priority in bootloader is wanted */
 #define HAVE_PRIORITY_SCHEDULING
+
 #if (CONFIG_CPU == S5L8702)
 #define USB_DRIVER_CLOSE
 #else
 #define USB_STATUS_BY_EVENT
 #define USB_DETECT_BY_REQUEST
 #endif
+
 #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC
 #define INCLUDE_TIMEOUT_API
 #define USB_DRIVER_CLOSE
 #endif
+
 #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_TNETV105
 #define INCLUDE_TIMEOUT_API
 #define USB_DRIVER_CLOSE
 #endif
+
 #if CONFIG_CPU == X1000
 #define USB_DRIVER_CLOSE
 #endif
-#endif
+
+#endif /* BOOTLOADER_USB_MODE */
 
 #else /* !BOOTLOADER */
 
 #define HAVE_EXTENDED_MESSAGING_AND_NAME
 #define HAVE_WAKEUP_EXT_CB
 
-
 #if defined(ASSEMBLER_THREADS) \
     || defined(HAVE_WIN32_FIBER_THREADS) \
     || defined(HAVE_SIGALTSTACK_THREADS)
@@ -993,7 +1012,7 @@ Lyre prototype 1 */
 #endif /* CONFIG_USB == */
 #endif /* HAVE_USBSTACK */
 
-#endif /* BOOTLOADER */
+#endif /* !BOOTLOADER */
 
 #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) || (CONFIG_CPU == JZ4760B) \
     || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \