diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2021-03-09 12:32:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 12:32:20 -0800 |
| commit | 709cee0aafd3dee493765e7ddc12c08cb75dea19 (patch) | |
| tree | e162bbc677059dab671a2b9acdc70f5b256f583d | |
| parent | 7d92f5aa5a0736810f882586031a5c4591a1b6a3 (diff) | |
| parent | 1e5ffe1a53cce31e8335e2f0878963de87dae57f (diff) | |
Merge pull request #4371 from jepler/revert-partition-change
Revert "circuitpy_mpconfig: Disable flash multi-partition"
| -rw-r--r-- | py/circuitpy_mpconfig.h | 2 | ||||
| -rw-r--r-- | supervisor/shared/flash.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 0cddcb83e..f61c3959f 100644 --- a/py/circuitpy_mpconfig.h +++ b/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) diff --git a/supervisor/shared/flash.c b/supervisor/shared/flash.c index 66f2f0704..1e09fe14b 100644 --- a/supervisor/shared/flash.c +++ b/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 |