mirror of
https://github.com/licsber/micropython.git
synced 2024-09-20 17:10:24 +08:00
e0905e85a7
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.
43 lines
1.4 KiB
Python
43 lines
1.4 KiB
Python
import esp
|
|
|
|
|
|
class FlashBdev:
|
|
SEC_SIZE = 4096
|
|
|
|
def __init__(self, start_sec, blocks):
|
|
self.start_sec = start_sec
|
|
self.blocks = blocks
|
|
|
|
def readblocks(self, n, buf, off=0):
|
|
# print("readblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
|
|
esp.flash_read((n + self.start_sec) * self.SEC_SIZE + off, buf)
|
|
|
|
def writeblocks(self, n, buf, off=None):
|
|
# print("writeblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
|
|
# assert len(buf) <= self.SEC_SIZE, len(buf)
|
|
if off is None:
|
|
esp.flash_erase(n + self.start_sec)
|
|
off = 0
|
|
esp.flash_write((n + self.start_sec) * self.SEC_SIZE + off, buf)
|
|
|
|
def ioctl(self, op, arg):
|
|
# print("ioctl(%d, %r)" % (op, arg))
|
|
if op == 4: # MP_BLOCKDEV_IOCTL_BLOCK_COUNT
|
|
return self.blocks
|
|
if op == 5: # MP_BLOCKDEV_IOCTL_BLOCK_SIZE
|
|
return self.SEC_SIZE
|
|
if op == 6: # MP_BLOCKDEV_IOCTL_BLOCK_ERASE
|
|
esp.flash_erase(arg + self.start_sec)
|
|
return 0
|
|
|
|
|
|
size = esp.flash_size()
|
|
if size < 1024 * 1024:
|
|
bdev = None
|
|
else:
|
|
start_sec = esp.flash_user_start() // FlashBdev.SEC_SIZE
|
|
if start_sec < 256:
|
|
start_sec += 1 # Reserve space for native code
|
|
# 20K at the flash end is reserved for SDK params storage
|
|
bdev = FlashBdev(start_sec, (size - 20480) // FlashBdev.SEC_SIZE - start_sec)
|