Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9710fed

Browse filesBrowse files
luc-githubme-no-dev
luc-github
authored and
me-no-dev
committed
Fix wrong values in .cvs files (espressif#3196)
* Fix wrong values in .cvs files Add missing upload size for partitions bigger than default one * Add new partion to generic Fix hardcoded partition for 16M flash
1 parent f5cacfe commit 9710fed
Copy full SHA for 9710fed

File tree

Expand file treeCollapse file tree

4 files changed

+18
-3
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+18
-3
lines changed

‎boards.txt

Copy file name to clipboardExpand all lines: boards.txt
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ esp32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FA
4646
esp32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
4747
esp32.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
4848
esp32.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
49+
esp32.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
4950
esp32.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
5051
esp32.menu.PartitionScheme.minimal.build.partitions=minimal
5152
esp32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
@@ -68,6 +69,10 @@ esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
6869
esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
6970
esp32.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
7071
esp32.menu.PartitionScheme.fatflash.build.partitions=ffat
72+
esp32.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
73+
esp32.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
74+
esp32.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
75+
esp32.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
7176

7277
esp32.menu.CPUFreq.240=240MHz (WiFi/BT)
7378
esp32.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -114,7 +119,6 @@ esp32.menu.FlashSize.2M.build.flash_size=2MB
114119
esp32.menu.FlashSize.2M.build.partitions=minimal
115120
esp32.menu.FlashSize.16M=16MB (128Mb)
116121
esp32.menu.FlashSize.16M.build.flash_size=16MB
117-
esp32.menu.FlashSize.16M.build.partitions=ffat
118122

119123
esp32.menu.UploadSpeed.921600=921600
120124
esp32.menu.UploadSpeed.921600.upload.speed=921600
@@ -2329,6 +2333,7 @@ m5stack-fire.menu.PSRAM.disabled.build.defines=
23292333

23302334
m5stack-fire.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS)
23312335
m5stack-fire.menu.PartitionScheme.default.build.partitions=default_16MB
2336+
m5stack-fire.menu.PartitionScheme.default.upload.maximum_size=6553600
23322337
m5stack-fire.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB)
23332338
m5stack-fire.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
23342339
m5stack-fire.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
@@ -2758,6 +2763,7 @@ heltec_wifi_lora_32_V2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-
27582763

27592764
heltec_wifi_lora_32_V2.menu.PartitionScheme.default=default_8MB
27602765
heltec_wifi_lora_32_V2.menu.PartitionScheme.default.build.partitions=default_8MB
2766+
heltec_wifi_lora_32_V2.menu.PartitionScheme.default.upload.maximum_size=3342336
27612767
heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
27622768
heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal.build.partitions=minimal
27632769
heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota=No OTA (Large APP)
@@ -2875,6 +2881,7 @@ heltec_wireless_stick.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-e
28752881

28762882
heltec_wireless_stick.menu.PartitionScheme.default=default_8MB
28772883
heltec_wireless_stick.menu.PartitionScheme.default.build.partitions=default_8MB
2884+
heltec_wireless_stick.menu.PartitionScheme.default.upload.maximum_size=3342336
28782885
heltec_wireless_stick.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
28792886
heltec_wireless_stick.menu.PartitionScheme.minimal.build.partitions=minimal
28802887
heltec_wireless_stick.menu.PartitionScheme.no_ota=No OTA (Large APP)
@@ -3955,6 +3962,7 @@ ttgo-t-watch.menu.PSRAM.disabled.build.defines=
39553962

39563963
ttgo-t-watch.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS)
39573964
ttgo-t-watch.menu.PartitionScheme.default.build.partitions=default_16MB
3965+
ttgo-t-watch.menu.PartitionScheme.default.upload.maximum_size=6553600
39583966
ttgo-t-watch.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB)
39593967
ttgo-t-watch.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
39603968
ttgo-t-watch.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824

‎tools/partitions/app3M_fat9M_16MB.csv

Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x300000,
5+
app1, app, ota_1, 0x310000,0x300000,
6+
ffat, data, fat, 0x610000,0x9F0000,
7+
# to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage

‎tools/partitions/default_ffat.csv

Copy file name to clipboardExpand all lines: tools/partitions/default_ffat.csv
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ nvs, data, nvs, 0x9000, 0x5000,
33
otadata, data, ota, 0xe000, 0x2000,
44
app0, app, ota_0, 0x10000, 0x140000,
55
app1, app, ota_1, 0x150000,0x140000,
6-
ffat, data, fat, 0x291000,0x170000,
6+
ffat, data, fat, 0x290000,0x170000,

‎tools/partitions/ffat.csv

Copy file name to clipboardExpand all lines: tools/partitions/ffat.csv
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ nvs, data, nvs, 0x9000, 0x5000,
33
otadata, data, ota, 0xe000, 0x2000,
44
app0, app, ota_0, 0x10000, 0x200000,
55
app1, app, ota_1, 0x210000,0x200000,
6-
ffat, data, fat, 0x410000,0xBEF000,
6+
ffat, data, fat, 0x410000,0xBF0000,
77
# to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.