djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "circuitpy_mpconfig: Disable flash multi-partition" 

This reverts commit 156ee4833a.
This commit is contained in:
Jeff Epler 2021-03-09 11:08:36 -06:00
parent 7d92f5aa5a
commit 1e5ffe1a53
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/circuitpy_mpconfig.h
View File

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

2
supervisor/shared/flash.c
View File

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