Skip to content

Commit d6e7cf1

Browse files
ficetoficeto
ficeto
authored and
ficeto
committed
add SPIFS support to up to 16MB flash chips
1 parent da6ce60 commit d6e7cf1

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

boards.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ generic.menu.FlashSize.4M.build.flash_size=4M
8585
generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
8686
generic.menu.FlashSize.4M.build.spiffs_start=0x100000
8787
generic.menu.FlashSize.4M.build.spiffs_end=0x3FB000
88+
generic.menu.FlashSize.8M=8M (7M SPIFFS)
89+
generic.menu.FlashSize.8M.build.flash_size=1M
90+
generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
91+
generic.menu.FlashSize.8M.build.spiffs_start=0x100000
92+
generic.menu.FlashSize.8M.build.spiffs_end=0x800000
93+
generic.menu.FlashSize.16M=16M (15M SPIFFS)
94+
generic.menu.FlashSize.16M.build.flash_size=1M
95+
generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
96+
generic.menu.FlashSize.16M.build.spiffs_start=0x100000
97+
generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
8898

8999
# generic.menu.FlashFreq.40=40MHz
90100
# generic.menu.FlashFreq.40.build.flash_freq=40

cores/esp8266/spiffs/spiffs_esp8266.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
bool flashmem_erase_sector( uint32_t sector_id ){
1212
WDT_RESET();
1313
noInterrupts();
14+
uint32_t chip_size = flashchip->chip_size;
15+
flashchip->chip_size = 0x01000000;
1416
bool erased = spi_flash_erase_sector( sector_id ) == SPI_FLASH_RESULT_OK;
17+
flashchip->chip_size = chip_size;
1518
interrupts();
1619
return erased;
1720
}
@@ -30,7 +33,10 @@ uint32_t flashmem_write_internal( const void *from, uint32_t toaddr, uint32_t si
3033
}
3134
WDT_RESET();
3235
noInterrupts();
36+
uint32_t chip_size = flashchip->chip_size;
37+
flashchip->chip_size = 0x01000000;
3338
r = spi_flash_write(toaddr, apbuf?(uint32 *)apbuf:(uint32 *)from, size);
39+
flashchip->chip_size = chip_size;
3440
interrupts();
3541
if(apbuf)
3642
os_free(apbuf);
@@ -48,7 +54,10 @@ uint32_t flashmem_read_internal( void *to, uint32_t fromaddr, uint32_t size ){
4854
SpiFlashOpResult r;
4955
WDT_RESET();
5056
noInterrupts();
57+
uint32_t chip_size = flashchip->chip_size;
58+
flashchip->chip_size = 0x01000000;
5159
r = spi_flash_read(fromaddr, (uint32 *)to, size);
60+
flashchip->chip_size = chip_size;
5261
interrupts();
5362
if(SPI_FLASH_RESULT_OK == r)
5463
return size;

0 commit comments

Comments
 (0)