Skip to content

Commit 2bdf05f

Browse files
gfwilliamsgfwilliams
committed
ESP32: Remove FlashFS, adjust partitions to increase available Storage from 256kB to 896kB
1 parent 453def8 commit 2bdf05f

19 files changed

+37
-329
lines changed

‎ChangeLog

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
Unlock functionCode early in function execution to reduce locks needed during recursion (#2616)
2828
nRF52: Improve software timer accuracy by keeping timer running while executing jstUtilTimerInterruptHandler (fix #2620)
2929
Bangle.js: setUI/etc now don't draw a 'back' icon if there is no widget bar (or it's hidden)
30+
ESP32: Remove FlashFS, adjust partitions to increase available Storage from 256kB to 896kB
3031

3132
2v25 : ESP32C3: Get analogRead working correctly
3233
Graphics: Adjust image alignment when rotating images to avoid cropping (fix #2535)

‎Makefile

-6
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,8 @@ DEFINES += -DUSE_FILESYSTEM_SDIO
393393
SOURCES += libs/filesystem/fat_sd/sdio_diskio.c
394394
# sdio_sdcard_X.c is added in make/family/X.make
395395
else #USE_FILESYSTEM_SDIO
396-
ifdef USE_FLASHFS
397-
DEFINES += -DUSE_FLASHFS
398-
SOURCES += \
399-
libs/filesystem/fat_sd/flash_diskio.c
400-
else
401396
SOURCES += \
402397
libs/filesystem/fat_sd/spi_diskio.c
403-
endif #USE_FLASHFS
404398
endif #USE_FILESYSTEM_SDIO
405399
endif #!LINUX
406400
endif #USE_FILESYSTEM

‎boards/CURIO.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
'TLS',
6666
# 'TELNET',
6767
# 'FILESYSTEM',
68-
# 'FLASHFS',
6968
'BLUETOOTH',
7069
'NEOPIXEL'
7170
],
@@ -100,7 +99,7 @@
10099
'saved_code' : {
101100
'address' : 0x320000,
102101
'page_size' : 4096,
103-
'pages' : 64,
102+
'pages' : 224, # 896kb - see partitions_espruino.csv
104103
'flash_available' : 1344, # firmware can be up to this size - see partitions_espruino.csv
105104
},
106105
};

‎boards/ESP32.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
'TELNET',
6565
'NEOPIXEL',
6666
'FILESYSTEM',
67-
'FLASHFS',
6867
'BLUETOOTH'
6968
],
7069
'makefile' : [
@@ -92,7 +91,7 @@
9291
'saved_code' : {
9392
'address' : 0x320000,
9493
'page_size' : 4096,
95-
'pages' : 64,
94+
'pages' : 224, # 896kb - see partitions_espruino.csv
9695
'flash_available' : 1344, # firmware can be up to this size - see partitions_espruino.csv
9796
},
9897
};
@@ -184,8 +183,8 @@ def get_pins():
184183

185184
pinutils.findpin(pins, "PD0", True)["functions"]["NEGATED"]=0; # BTN1 negate
186185

187-
pinutils.findpin(pins, "PD1", True)["functions"]["USART1_TX"]=0;
188-
pinutils.findpin(pins, "PD3", True)["functions"]["USART1_RX"]=0;
186+
pinutils.findpin(pins, "PD1", True)["functions"]["USART1_TX"]=0;
187+
pinutils.findpin(pins, "PD3", True)["functions"]["USART1_RX"]=0;
189188
pinutils.findpin(pins, "PD4", True)["functions"]["USART2_TX"]=0; # default is 10 but can't use this as it's on SPI flash - match what jshardwareUart used
190189
pinutils.findpin(pins, "PD5", True)["functions"]["USART2_RX"]=0; # default is 9 but can't use this as it's on SPI flash
191190
pinutils.findpin(pins, "PD16", True)["functions"]["USART3_RX"]=0;

‎boards/ESP32C3_IDF4.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
'TLS',
6666
# 'TELNET',
6767
# 'FILESYSTEM',
68-
# 'FLASHFS',
6968
'BLUETOOTH',
7069
'NEOPIXEL'
7170
],
@@ -95,7 +94,7 @@
9594
'saved_code' : {
9695
'address' : 0x320000,
9796
'page_size' : 4096,
98-
'pages' : 64,
97+
'pages' : 224, # 896kb - see partitions_espruino.csv
9998
'flash_available' : 1344, # firmware can be up to this size - see partitions_espruino.csv
10099
},
101100
};

‎boards/ESP32S3_IDF4.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
'TELNET',
6767
'NEOPIXEL',
6868
'FILESYSTEM',
69-
# 'FLASHFS',
7069
'BLUETOOTH'
7170
],
7271
'makefile' : [
@@ -95,7 +94,7 @@
9594
'saved_code' : {
9695
'address' : 0x320000,
9796
'page_size' : 4096,
98-
'pages' : 64,
97+
'pages' : 224, # 896kb - see partitions_espruino.csv
9998
'flash_available' : 1344, # firmware can be up to this size - see partitions_espruino.csv
10099
},
101100
};
@@ -167,10 +166,10 @@ def get_pins():
167166
pinutils.findpin(pins, "PD6", True)["functions"]["SPI2_MISO"]=0;
168167
pinutils.findpin(pins, "PD7", True)["functions"]["SPI2_MOSI"]=0;
169168

170-
pinutils.findpin(pins, "PD43", True)["functions"]["USART1_TX"]=0;
171-
pinutils.findpin(pins, "PD44", True)["functions"]["USART1_RX"]=0;
172-
pinutils.findpin(pins, "PD17", True)["functions"]["USART2_TX"]=0;
173-
pinutils.findpin(pins, "PD18", True)["functions"]["USART2_RX"]=0;
169+
pinutils.findpin(pins, "PD43", True)["functions"]["USART1_TX"]=0;
170+
pinutils.findpin(pins, "PD44", True)["functions"]["USART1_RX"]=0;
171+
pinutils.findpin(pins, "PD17", True)["functions"]["USART2_TX"]=0;
172+
pinutils.findpin(pins, "PD18", True)["functions"]["USART2_RX"]=0;
174173

175174
# everything is non-5v tolerant
176175
#for pin in pins:

‎boards/ESP32_CYD.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
'saved_code' : {
102102
'address' : 0x320000,
103103
'page_size' : 4096,
104-
'pages' : 64,
104+
'pages' : 224, # 896kb - see partitions_espruino.csv
105105
'flash_available' : 1344, # firmware can be up to this size - see partitions_espruino.csv
106106
},
107107
};

‎boards/ESP32_IDF4.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
# 'TELNET',
6767
'NEOPIXEL',
6868
# 'FILESYSTEM',
69-
# 'FLASHFS',
7069
'BLUETOOTH'
7170
],
7271
'makefile' : [
@@ -94,7 +93,7 @@
9493
'saved_code' : {
9594
'address' : 0x320000,
9695
'page_size' : 4096,
97-
'pages' : 64,
96+
'pages' : 224, # 896kb - see partitions_espruino.csv
9897
'flash_available' : 1344, # firmware can be up to this size - see partitions_espruino.csv
9998
},
10099
};

‎boards/ESP8266_4MB.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
'CRYPTO',
3030
'NEOPIXEL',
3131
#'FILESYSTEM',
32-
#'FLASHFS'
3332
],
3433
'makefile' : [
3534
'FLASH_4MB=1',
@@ -53,8 +52,8 @@
5352
'adc' : 1,
5453
'dac' : 0,
5554
'saved_code' : {
56-
# 0x000000 + 4096 * ( 256 - 48 save - 1 wifi - 4 reserved )
57-
'address' : 0x0CB000,
55+
# 0x000000 + 4096 * ( 256 - 48 save - 1 wifi - 4 reserved )
56+
'address' : 0x0CB000,
5857
'page_size' : 4096,
5958
'pages' : 48,
6059
'flash_available' : 812, # firmware can be up to this size
@@ -120,11 +119,11 @@ def get_pins():
120119
{ "name":"PD2", "sortingname":"D02", "port":"D", "num":"2", "functions":{"USART2_TX":0}, "csv":{} },
121120
{ "name":"PD3", "sortingname":"D03", "port":"D", "num":"3", "functions":{"USART1_RX":0}, "csv":{} },
122121
{ "name":"PD4", "sortingname":"D04", "port":"D", "num":"4", "functions":{}, "csv":{} },
123-
{ "name":"PD5", "sortingname":"D05", "port":"D", "num":"5", "functions":{}, "csv":{} },
124-
{ "name":"PD6", "sortingname":"D06", "port":"D", "num":"6", "functions":{}, "csv":{} },
125-
{ "name":"PD7", "sortingname":"D07", "port":"D", "num":"7", "functions":{}, "csv":{} },
122+
{ "name":"PD5", "sortingname":"D05", "port":"D", "num":"5", "functions":{}, "csv":{} },
123+
{ "name":"PD6", "sortingname":"D06", "port":"D", "num":"6", "functions":{}, "csv":{} },
124+
{ "name":"PD7", "sortingname":"D07", "port":"D", "num":"7", "functions":{}, "csv":{} },
126125
{ "name":"PD8", "sortingname":"D08", "port":"D", "num":"8", "functions":{}, "csv":{} },
127-
{ "name":"PD9", "sortingname":"D09", "port":"D", "num":"9", "functions":{}, "csv":{} },
126+
{ "name":"PD9", "sortingname":"D09", "port":"D", "num":"9", "functions":{}, "csv":{} },
128127
{ "name":"PD10", "sortingname":"D10", "port":"D", "num":"10", "functions":{}, "csv":{} },
129128
{ "name":"PD11", "sortingname":"D11", "port":"D", "num":"11", "functions":{}, "csv":{} },
130129
{ "name":"PD12", "sortingname":"D12", "port":"D", "num":"12", "functions":{"SPI1_MISO":0}, "csv":{} },

‎libs/filesystem/fat_sd/ffconf.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,7 @@
172172

173173

174174
#define _MIN_SS 512
175-
#ifdef USE_FLASHFS
176-
#define _MAX_SS 4096
177-
#else
178175
#define _MAX_SS 512
179-
#endif
180176
/* These options configure the range of sector size to be supported. (512, 1024,
181177
/ 2048 or 4096) Always set both 512 for most systems, all type of memory cards and
182178
/ harddisk. But a larger value may be required for on-board flash memory and some
@@ -219,7 +215,7 @@
219215
/ defined by _NORTC_MON, _NORTC_MDAY and _NORTC_YEAR.
220216
/ When timestamp feature is enabled (_FS_NORTC == 0), get_fattime() function need
221217
/ to be added to the project to read current time from RTC. _NORTC_MON,
222-
/ _NORTC_MDAY and _NORTC_YEAR have no effect.
218+
/ _NORTC_MDAY and _NORTC_YEAR have no effect.
223219
/ These options have no effect at read-only configuration (_FS_READONLY == 1). */
224220
#else
225221
#define _FS_NORTC 0

‎libs/filesystem/fat_sd/flash_diskio.c

-155
This file was deleted.

‎libs/filesystem/fat_sd/flash_diskio.h

-33
This file was deleted.

0 commit comments

Comments
 (0)