Merge remote-tracking branch 'origin/main' into main

Author: weblate

py/circuitpy_mpconfig.h

@@ -133,7 +133,7 @@
 #define MICROPY_FATFS_LFN_CODE_PAGE   (437)
 #define MICROPY_FATFS_USE_LABEL       (1)
 #define MICROPY_FATFS_RPATH           (2)
-#define MICROPY_FATFS_MULTI_PARTITION (0)
+#define MICROPY_FATFS_MULTI_PARTITION (1)
 
 // Only enable this if you really need it. It allocates a byte cache of this size.
 // #define MICROPY_FATFS_MAX_SS           (4096)

supervisor/shared/flash.c

@@ -213,9 +213,7 @@ void supervisor_flash_init_vfs(fs_user_mount_t *vfs) {
     vfs->base.type = &mp_fat_vfs_type;
     vfs->flags |= FSUSER_NATIVE | FSUSER_HAVE_IOCTL;
     vfs->fatfs.drv = vfs;
-#if MICROPY_FATFS_MULTI_PARTITION
     vfs->fatfs.part = 1; // flash filesystem lives on first partition
-#endif
     vfs->readblocks[0] = (mp_obj_t)&supervisor_flash_obj_readblocks_obj;
     vfs->readblocks[1] = (mp_obj_t)&supervisor_flash_obj;
     vfs->readblocks[2] = (mp_obj_t)flash_read_blocks; // native version