Skip to content

Commit 81566a9

Browse files
committed
Add 512k (no SPIFFS) build option (#862)
1 parent bfe15b8 commit 81566a9

File tree

4 files changed

+41
-9
lines changed

4 files changed

+41
-9
lines changed

hardware/esp8266com/esp8266/boards.txt

+14-9
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,18 @@ generic.menu.UploadSpeed.512000.upload.speed=512000
6565
generic.menu.UploadSpeed.921600=921600
6666
generic.menu.UploadSpeed.921600.upload.speed=921600
6767

68-
generic.menu.FlashSize.512K=512K (64K SPIFFS)
69-
generic.menu.FlashSize.512K.build.flash_size=512K
70-
generic.menu.FlashSize.512K.build.flash_ld=eagle.flash.512k.ld
71-
generic.menu.FlashSize.512K.build.spiffs_start=0x6B000
72-
generic.menu.FlashSize.512K.build.spiffs_end=0x7B000
73-
generic.menu.FlashSize.512K.build.spiffs_blocksize=4096
74-
generic.menu.FlashSize.512K.upload.maximum_size=434160
68+
generic.menu.FlashSize.512K64=512K (64K SPIFFS)
69+
generic.menu.FlashSize.512K64.build.flash_size=512K
70+
generic.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
71+
generic.menu.FlashSize.512K64.build.spiffs_start=0x6B000
72+
generic.menu.FlashSize.512K64.build.spiffs_end=0x7B000
73+
generic.menu.FlashSize.512K64.build.spiffs_blocksize=4096
74+
generic.menu.FlashSize.512K64.upload.maximum_size=434160
75+
76+
generic.menu.FlashSize.512K0=512K (no SPIFFS)
77+
generic.menu.FlashSize.512K0.build.flash_size=512K
78+
generic.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
79+
generic.menu.FlashSize.512K0.upload.maximum_size=499696
7580

7681
generic.menu.FlashSize.1M512=1M (512K SPIFFS)
7782
generic.menu.FlashSize.1M512.build.flash_size=1M
@@ -410,7 +415,7 @@ thing.build.variant=thing
410415
thing.build.flash_mode=qio
411416
# flash chip: AT25SF041 (512 kbyte, 4Mbit)
412417
thing.build.flash_size=512K
413-
thing.build.flash_ld=eagle.flash.512k.ld
418+
thing.build.flash_ld=eagle.flash.512k64.ld
414419
thing.build.flash_freq=40
415420
thing.build.spiffs_start=0x6B000
416421
thing.build.spiffs_end=0x7B000
@@ -526,7 +531,7 @@ esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256
526531
# wifio.build.flash_mode=qio
527532
# wifio.build.flash_size=512K
528533
# wifio.build.flash_freq=40
529-
# wifio.build.flash_ld=eagle.flash.512k.ld
534+
# wifio.build.flash_ld=eagle.flash.512k64.ld
530535
# wifio.build.spiffs_start=0x6B000
531536
# wifio.build.spiffs_end=0x7B000
532537
#

hardware/esp8266com/esp8266/cores/esp8266/spiffs_api.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ class SPIFFSImpl : public FSImpl {
100100
if (SPIFFS_mounted(&_fs) != 0) {
101101
return true;
102102
}
103+
if (_size == 0) {
104+
DEBUGV("SPIFFS size is zero");
105+
return false;
106+
}
103107
if (_tryMount()) {
104108
return true;
105109
}
@@ -112,6 +116,11 @@ class SPIFFSImpl : public FSImpl {
112116
}
113117

114118
bool format() override {
119+
if (_size == 0) {
120+
DEBUGV("SPIFFS size is zero");
121+
return false;
122+
}
123+
115124
bool wasMounted = (SPIFFS_mounted(&_fs) != 0);
116125

117126
if (_tryMount()) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* Flash Split for 512K chips, no SPIFFS */
2+
/* sketch 487KB */
3+
/* eeprom 20KB */
4+
5+
MEMORY
6+
{
7+
dport0_0_seg : org = 0x3FF00000, len = 0x10
8+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
9+
iram1_0_seg : org = 0x40100000, len = 0x8000
10+
irom0_0_seg : org = 0x40201010, len = 0x79ff0
11+
}
12+
13+
PROVIDE ( _SPIFFS_start = 0 );
14+
PROVIDE ( _SPIFFS_end = 0 );
15+
PROVIDE ( _SPIFFS_page = 0 );
16+
PROVIDE ( _SPIFFS_block = 0 );
17+
18+
INCLUDE "../ld/eagle.app.v6.common.ld"

0 commit comments

Comments
 (0)