Skip to content

Commit d5aeca2

Browse files
committed
esp8266: Rename ROMFS partition config variables to include "part0".
For consistency with the stm32 port. Signed-off-by: Damien George <[email protected]>
1 parent bf9cdd2 commit d5aeca2

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

ports/esp8266/boards/esp8266_2MiB_ROMFS.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ MEMORY
1717
}
1818

1919
/* define ROMFS extents */
20-
_micropy_hw_romfs_start = ORIGIN(FLASH_ROMFS);
21-
_micropy_hw_romfs_size = LENGTH(FLASH_ROMFS);
20+
_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
21+
_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);
2222

2323
/* define common sections and symbols */
2424
INCLUDE boards/esp8266_common.ld

ports/esp8266/modesp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ static MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
165165

166166
extern byte _firmware_size[];
167167
#if MICROPY_VFS_ROM_IOCTL
168-
extern uint8_t _micropy_hw_romfs_size;
168+
extern uint8_t _micropy_hw_romfs_part0_size;
169169
#endif
170170

171171
static mp_obj_t esp_flash_user_start(void) {
172172
uint32_t flash_user_start = (uint32_t)_firmware_size;
173173
#if MICROPY_VFS_ROM_IOCTL
174-
flash_user_start += (uint32_t)&_micropy_hw_romfs_size;
174+
flash_user_start += (uint32_t)&_micropy_hw_romfs_part0_size;
175175
#endif
176176
return MP_OBJ_NEW_SMALL_INT(flash_user_start);
177177
}

ports/esp8266/vfs_rom_ioctl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
#define FLASH_MEM_BASE (0x40200000)
3636
#define FLASH_PAGE_SIZE (4096)
3737

38-
#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_start)
39-
#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_size)
38+
#define MICROPY_HW_ROMFS_BASE (uintptr_t)(&_micropy_hw_romfs_part0_start)
39+
#define MICROPY_HW_ROMFS_BYTES (uintptr_t)(&_micropy_hw_romfs_part0_size)
4040

4141
#define ROMFS_SPI_FLASH_OFFSET (MICROPY_HW_ROMFS_BASE - FLASH_MEM_BASE)
4242

43-
extern uint8_t _micropy_hw_romfs_start;
44-
extern uint8_t _micropy_hw_romfs_size;
43+
extern uint8_t _micropy_hw_romfs_part0_start;
44+
extern uint8_t _micropy_hw_romfs_part0_size;
4545

4646
static const MP_DEFINE_MEMORYVIEW_OBJ(romfs_obj, 'B', 0, MICROPY_HW_ROMFS_BYTES, (void *)MICROPY_HW_ROMFS_BASE);
4747

0 commit comments

Comments
 (0)