diff options
| author | Damien George <damien@micropython.org> | 2025-03-11 13:23:50 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-03-13 18:30:21 +1100 |
| commit | d5aeca2e83a03657ee2b5b21225d5a10aba10f56 (patch) | |
| tree | 7287e077cb4f597b61f503c6aea85b7c525e8ea1 | |
| parent | bf9cdd21891d30807ad6e0e229774d589cd5709f (diff) | |
esp8266: Rename ROMFS partition config variables to include "part0".
For consistency with the stm32 port.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | ports/esp8266/boards/esp8266_2MiB_ROMFS.ld | 4 | ||||
| -rw-r--r-- | ports/esp8266/modesp.c | 4 | ||||
| -rw-r--r-- | ports/esp8266/vfs_rom_ioctl.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld b/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld index 6020c3d48..ce057981a 100644 --- a/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld +++ b/ports/esp8266/boards/esp8266_2MiB_ROMFS.ld @@ -17,8 +17,8 @@ MEMORY } /* define ROMFS extents */ -_micropy_hw_romfs_start = ORIGIN(FLASH_ROMFS); -_micropy_hw_romfs_size = LENGTH(FLASH_ROMFS); +_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS); +_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS); /* define common sections and symbols */ INCLUDE boards/esp8266_common.ld diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c index c88022945..e1f9d3968 100644 --- a/ports/esp8266/modesp.c +++ b/ports/esp8266/modesp.c @@ -165,13 +165,13 @@ static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size); extern byte _firmware_size[]; #if MICROPY_VFS_ROM_IOCTL -extern uint8_t _micropy_hw_romfs_size; +extern uint8_t _micropy_hw_romfs_part0_size; #endif static mp_obj_t esp_flash_user_start(void) { uint32_t flash_user_start = (uint32_t)_firmware_size; #if MICROPY_VFS_ROM_IOCTL - flash_user_start += (uint32_t)&_micropy_hw_romfs_size; + flash_user_start += (uint32_t)&_micropy_hw_romfs_part0_size; #endif return MP_OBJ_NEW_SMALL_INT(flash_user_start); } diff --git a/ports/esp8266/vfs_rom_ioctl.c b/ports/esp8266/vfs_rom_ioctl.c index c7528375b..eb260cb50 100644 --- a/ports/esp8266/vfs_rom_ioctl.c +++ b/ports/esp8266/vfs_rom_ioctl.c @@ -35,13 +35,13 @@ #define FLASH_MEM_BASE (0x40200000) #define FLASH_PAGE_SIZE (4096) -#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_start) -#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_size) +#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_part0_start) +#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_part0_size) #define ROMFS_SPI_FLASH_OFFSET (MICROPY_HW_ROMFS_BASE - FLASH_MEM_BASE) -extern uint8_t _micropy_hw_romfs_start; -extern uint8_t _micropy_hw_romfs_size; +extern uint8_t _micropy_hw_romfs_part0_start; +extern uint8_t _micropy_hw_romfs_part0_size; static const MP_DEFINE_MEMORYVIEW_OBJ(romfs_obj, 'B', 0, MICROPY_HW_ROMFS_BYTES, (void *)MICROPY_HW_ROMFS_BASE); |