forked from micropython/micropython
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
esp8266: Change from FAT to littlefs v2 as default filesystem.
This commit changes the esp8266 boards to use littlefs v2 as the filesystem, rather than FAT. Since the esp8266 doesn't expose the filesystem to the PC over USB there's no strong reason to keep it as FAT. Littlefs is smaller in code size, is more efficient in use of flash to store data, is resilient over power failure, and using it saves about 4k of heap RAM, which can now be used for other things. This is a backwards incompatible change because all existing esp8266 boards will need to update their filesystem after installing new firmware (eg backup old files, install firmware, restore files to new filesystem). As part of this commit the memory layout of the default board (GENERIC) has changed. It now allocates all 1M of memory-mapped flash to the firmware, so the filesystem area starts at the 2M point. This is done to allow more frozen bytecode to be stored in the 1M of memory-mapped flash. This requires an esp8266 module with 2M or more of flash to work, so a new board called GENERIC_1M is added which has the old memory-mapping (but still changed to use littlefs for the filesystem). In summary there are now 3 esp8266 board definitions: - GENERIC_512K: for 512k modules, doesn't have a filesystem. - GENERIC_1M: for 1M modules, 572k for firmware+frozen code, 396k for filesystem (littlefs). - GENERIC: for 2M (or greater) modules, 968k for firmware+frozen code, 1M+ for filesystem (littlefs), FAT driver also included in firmware for use on, eg, external SD cards.
- Loading branch information
Showing
12 changed files
with
91 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
LD_FILES = boards/esp8266_2m.ld | ||
|
||
MICROPY_PY_BTREE = 1 | ||
MICROPY_VFS_FAT = 1 | ||
MICROPY_VFS_LFS2 = 1 | ||
|
||
FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#define MICROPY_HW_BOARD_NAME "ESP module (1M)" | ||
#define MICROPY_HW_MCU_NAME "ESP8266" | ||
|
||
#define MICROPY_PERSISTENT_CODE_LOAD (1) | ||
#define MICROPY_EMIT_XTENSA (1) | ||
#define MICROPY_EMIT_INLINE_XTENSA (1) | ||
|
||
#define MICROPY_DEBUG_PRINTERS (1) | ||
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL) | ||
|
||
#define MICROPY_READER_VFS (MICROPY_VFS) | ||
#define MICROPY_VFS (1) | ||
|
||
#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1) | ||
#define MICROPY_PY_ALL_SPECIAL_METHODS (1) | ||
#define MICROPY_PY_IO_FILEIO (1) | ||
#define MICROPY_PY_SYS_STDIO_BUFFER (1) | ||
#define MICROPY_PY_URE_SUB (1) | ||
#define MICROPY_PY_UCRYPTOLIB (1) | ||
#define MICROPY_PY_FRAMEBUF (1) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
LD_FILES = boards/esp8266_1m.ld | ||
|
||
MICROPY_PY_BTREE = 1 | ||
MICROPY_VFS_LFS2 = 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
MICROPY_PY_BTREE = 0 | ||
MICROPY_VFS_FAT = 0 | ||
LD_FILES = boards/esp8266_512k.ld |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/* GNU linker script for ESP8266 with 1M flash | ||
|
||
Flash layout: | ||
0x40200000 36k header + iram/dram init | ||
0x40209000 572k firmware (irom0) | ||
0x40298000 396k filesystem | ||
0x402fb000 20k SDK parameters | ||
*/ | ||
|
||
MEMORY | ||
{ | ||
dport0_0_seg : org = 0x3ff00000, len = 16 | ||
dram0_0_seg : org = 0x3ffe8000, len = 80K | ||
iram1_0_seg : org = 0x40100000, len = 32K | ||
irom0_0_seg : org = 0x40209000, len = 572K | ||
} | ||
|
||
/* define common sections and symbols */ | ||
INCLUDE boards/esp8266_common.ld |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/* GNU linker script for ESP8266 with 2M or more flash | ||
|
||
Flash layout: | ||
0x40200000 36k header + iram/dram init | ||
0x40209000 988k firmware (irom0) | ||
0x40300000 1M+ filesystem (not memory mapped) | ||
*/ | ||
|
||
MEMORY | ||
{ | ||
dport0_0_seg : org = 0x3ff00000, len = 16 | ||
dram0_0_seg : org = 0x3ffe8000, len = 80K | ||
iram1_0_seg : org = 0x40100000, len = 32K | ||
irom0_0_seg : org = 0x40209000, len = 1M - 36K | ||
} | ||
|
||
/* define common sections and symbols */ | ||
INCLUDE boards/esp8266_common.ld |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters