From 6d6fd04785598a26e99b6a0121215718de295618 Mon Sep 17 00:00:00 2001 From: reaper7 Date: Mon, 9 Apr 2018 09:54:38 +0200 Subject: [PATCH 1/2] Additional partition scheme min_spiffs with minimal SPIFFS partition size and OTA support for bigger apps --- Kconfig.projbuild | 3 +++ boards.txt | 2 ++ tools/partitions/min_spiffs.csv | 7 +++++++ 3 files changed, 12 insertions(+) create mode 100644 tools/partitions/min_spiffs.csv diff --git a/Kconfig.projbuild b/Kconfig.projbuild index 25cbe107951..9e131b040c2 100644 --- a/Kconfig.projbuild +++ b/Kconfig.projbuild @@ -90,6 +90,8 @@ config ARDUHAL_PARTITION_SCHEME_MINIMAL bool "Minimal (for 2MB FLASH)" config ARDUHAL_PARTITION_SCHEME_NO_OTA bool "No OTA (for large apps)" +config ARDUHAL_PARTITION_SCHEME_MIN_SPIFFS + bool "Minimal SPIFFS (for large apps with OTA)" endchoice config ARDUHAL_PARTITION_SCHEME @@ -97,6 +99,7 @@ config ARDUHAL_PARTITION_SCHEME default "default" if ARDUHAL_PARTITION_SCHEME_DEFAULT default "minimal" if ARDUHAL_PARTITION_SCHEME_MINIMAL default "no_ota" if ARDUHAL_PARTITION_SCHEME_NO_OTA + default "min_spiffs" if ARDUHAL_PARTITION_SCHEME_MIN_SPIFFS config AUTOCONNECT_WIFI diff --git a/boards.txt b/boards.txt index 010d624b5b6..5eba70a6c56 100644 --- a/boards.txt +++ b/boards.txt @@ -35,6 +35,8 @@ esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH) esp32.menu.PartitionScheme.minimal.build.partitions=minimal esp32.menu.PartitionScheme.no_ota=No OTA (Large APP) esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota +esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs esp32.menu.FlashMode.qio=QIO esp32.menu.FlashMode.qio.build.flash_mode=dio diff --git a/tools/partitions/min_spiffs.csv b/tools/partitions/min_spiffs.csv new file mode 100644 index 00000000000..ae4aa752671 --- /dev/null +++ b/tools/partitions/min_spiffs.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, 0x1E0000, +app1, app, ota_1, 0x1F0000,0x1E0000, +eeprom, data, 0x99, 0x3F0000,0x1000, +spiffs, data, spiffs, 0x3F1000,0xF000, From ad04608ee0fe4ddade52a4fca615e22eabc75b67 Mon Sep 17 00:00:00 2001 From: reaper7 Date: Fri, 4 May 2018 17:40:23 +0200 Subject: [PATCH 2/2] Selectable (from menu) partitions for m5stack addition for m5stack (as is prepared for lolin32 board: https://github.com/espressif/arduino-esp32/pull/1379) discourse here: https://github.com/espressif/arduino-esp32/issues/1378 --- boards.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/boards.txt b/boards.txt index 6a78f4e26c9..a66165bcd9c 100644 --- a/boards.txt +++ b/boards.txt @@ -1267,6 +1267,15 @@ m5stack-core-esp32.menu.FlashFreq.80.build.flash_freq=80m m5stack-core-esp32.menu.FlashFreq.40=40MHz m5stack-core-esp32.menu.FlashFreq.40.build.flash_freq=40m +m5stack-core-esp32.menu.PartitionScheme.default=Default +m5stack-core-esp32.menu.PartitionScheme.default.build.partitions=default +m5stack-core-esp32.menu.PartitionScheme.no_ota=No OTA (Large APP) +m5stack-core-esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota +m5stack-core-esp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +m5stack-core-esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +m5stack-core-esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +m5stack-core-esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + m5stack-core-esp32.menu.UploadSpeed.921600=921600 m5stack-core-esp32.menu.UploadSpeed.921600.upload.speed=921600 m5stack-core-esp32.menu.UploadSpeed.115200=115200