From 9710fedaf05c85e3c8e5d23b076bd47561a0ca21 Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:52:51 +0200 Subject: [PATCH] Fix wrong values in .cvs files (#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 --- boards.txt | 10 +++++++++- tools/partitions/app3M_fat9M_16MB.csv | 7 +++++++ tools/partitions/default_ffat.csv | 2 +- tools/partitions/ffat.csv | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tools/partitions/app3M_fat9M_16MB.csv diff --git a/boards.txt b/boards.txt index 8bceecf1..5e152941 100644 --- a/boards.txt +++ b/boards.txt @@ -46,6 +46,7 @@ esp32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FA esp32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat esp32.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT) esp32.menu.PartitionScheme.default_8MB.build.partitions=default_8MB +esp32.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336 esp32.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS) esp32.menu.PartitionScheme.minimal.build.partitions=minimal esp32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) @@ -68,6 +69,10 @@ esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 esp32.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT) esp32.menu.PartitionScheme.fatflash.build.partitions=ffat +esp32.menu.PartitionScheme.fatflash.upload.maximum_size=2097152 +esp32.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS) +esp32.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB +esp32.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 esp32.menu.CPUFreq.240=240MHz (WiFi/BT) esp32.menu.CPUFreq.240.build.f_cpu=240000000L @@ -114,7 +119,6 @@ esp32.menu.FlashSize.2M.build.flash_size=2MB esp32.menu.FlashSize.2M.build.partitions=minimal esp32.menu.FlashSize.16M=16MB (128Mb) esp32.menu.FlashSize.16M.build.flash_size=16MB -esp32.menu.FlashSize.16M.build.partitions=ffat esp32.menu.UploadSpeed.921600=921600 esp32.menu.UploadSpeed.921600.upload.speed=921600 @@ -2329,6 +2333,7 @@ m5stack-fire.menu.PSRAM.disabled.build.defines= m5stack-fire.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS) m5stack-fire.menu.PartitionScheme.default.build.partitions=default_16MB +m5stack-fire.menu.PartitionScheme.default.upload.maximum_size=6553600 m5stack-fire.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB) m5stack-fire.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB 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- heltec_wifi_lora_32_V2.menu.PartitionScheme.default=default_8MB heltec_wifi_lora_32_V2.menu.PartitionScheme.default.build.partitions=default_8MB +heltec_wifi_lora_32_V2.menu.PartitionScheme.default.upload.maximum_size=3342336 heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal=Minimal (2MB FLASH) heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal.build.partitions=minimal 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 heltec_wireless_stick.menu.PartitionScheme.default=default_8MB heltec_wireless_stick.menu.PartitionScheme.default.build.partitions=default_8MB +heltec_wireless_stick.menu.PartitionScheme.default.upload.maximum_size=3342336 heltec_wireless_stick.menu.PartitionScheme.minimal=Minimal (2MB FLASH) heltec_wireless_stick.menu.PartitionScheme.minimal.build.partitions=minimal heltec_wireless_stick.menu.PartitionScheme.no_ota=No OTA (Large APP) @@ -3955,6 +3962,7 @@ ttgo-t-watch.menu.PSRAM.disabled.build.defines= ttgo-t-watch.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS) ttgo-t-watch.menu.PartitionScheme.default.build.partitions=default_16MB +ttgo-t-watch.menu.PartitionScheme.default.upload.maximum_size=6553600 ttgo-t-watch.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB) ttgo-t-watch.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB ttgo-t-watch.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824 diff --git a/tools/partitions/app3M_fat9M_16MB.csv b/tools/partitions/app3M_fat9M_16MB.csv new file mode 100644 index 00000000..0f67e69f --- /dev/null +++ b/tools/partitions/app3M_fat9M_16MB.csv @@ -0,0 +1,7 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x300000, +app1, app, ota_1, 0x310000,0x300000, +ffat, data, fat, 0x610000,0x9F0000, +# to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage diff --git a/tools/partitions/default_ffat.csv b/tools/partitions/default_ffat.csv index b5bca09d..d921c9fe 100644 --- a/tools/partitions/default_ffat.csv +++ b/tools/partitions/default_ffat.csv @@ -3,4 +3,4 @@ nvs, data, nvs, 0x9000, 0x5000, otadata, data, ota, 0xe000, 0x2000, app0, app, ota_0, 0x10000, 0x140000, app1, app, ota_1, 0x150000,0x140000, -ffat, data, fat, 0x291000,0x170000, +ffat, data, fat, 0x290000,0x170000, diff --git a/tools/partitions/ffat.csv b/tools/partitions/ffat.csv index ed8720bf..b98bf0c3 100644 --- a/tools/partitions/ffat.csv +++ b/tools/partitions/ffat.csv @@ -3,5 +3,5 @@ nvs, data, nvs, 0x9000, 0x5000, otadata, data, ota, 0xe000, 0x2000, app0, app, ota_0, 0x10000, 0x200000, app1, app, ota_1, 0x210000,0x200000, -ffat, data, fat, 0x410000,0xBEF000, +ffat, data, fat, 0x410000,0xBF0000, # to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage