From 6d6fd04785598a26e99b6a0121215718de295618 Mon Sep 17 00:00:00 2001 From: reaper7 Date: Mon, 9 Apr 2018 09:54:38 +0200 Subject: [PATCH 1/3] 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/3] 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 From 999afa458a03442d1ab3ceb32f7f8532a2e949b1 Mon Sep 17 00:00:00 2001 From: reaper7 Date: Thu, 24 May 2018 08:48:18 +0200 Subject: [PATCH 3/3] Selectable (from menu) partitions for MH ET LIVE boards in reference to other boards (m5stack, lolin32) this PR adds partition scheme selection for MH ET LIVE boards also adds Core Debug Level selection for above boards --- boards.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/boards.txt b/boards.txt index 3766ea866c1..3b1751cabaa 100644 --- a/boards.txt +++ b/boards.txt @@ -975,6 +975,15 @@ mhetesp32devkit.menu.FlashFreq.80.build.flash_freq=80m mhetesp32devkit.menu.FlashFreq.40=40MHz mhetesp32devkit.menu.FlashFreq.40.build.flash_freq=40m +mhetesp32devkit.menu.PartitionScheme.default=Default +mhetesp32devkit.menu.PartitionScheme.default.build.partitions=default +mhetesp32devkit.menu.PartitionScheme.no_ota=No OTA (Large APP) +mhetesp32devkit.menu.PartitionScheme.no_ota.build.partitions=no_ota +mhetesp32devkit.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +mhetesp32devkit.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +mhetesp32devkit.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +mhetesp32devkit.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + mhetesp32devkit.menu.UploadSpeed.921600=921600 mhetesp32devkit.menu.UploadSpeed.921600.upload.speed=921600 mhetesp32devkit.menu.UploadSpeed.115200=115200 @@ -990,6 +999,19 @@ mhetesp32devkit.menu.UploadSpeed.460800.upload.speed=460800 mhetesp32devkit.menu.UploadSpeed.512000.windows=512000 mhetesp32devkit.menu.UploadSpeed.512000.upload.speed=512000 +mhetesp32devkit.menu.DebugLevel.none=None +mhetesp32devkit.menu.DebugLevel.none.build.code_debug=0 +mhetesp32devkit.menu.DebugLevel.error=Error +mhetesp32devkit.menu.DebugLevel.error.build.code_debug=1 +mhetesp32devkit.menu.DebugLevel.warn=Warn +mhetesp32devkit.menu.DebugLevel.warn.build.code_debug=2 +mhetesp32devkit.menu.DebugLevel.info=Info +mhetesp32devkit.menu.DebugLevel.info.build.code_debug=3 +mhetesp32devkit.menu.DebugLevel.debug=Debug +mhetesp32devkit.menu.DebugLevel.debug.build.code_debug=4 +mhetesp32devkit.menu.DebugLevel.verbose=Verbose +mhetesp32devkit.menu.DebugLevel.verbose.build.code_debug=5 + ############################################################## mhetesp32minikit.name=MH ET LIVE ESP32MiniKit @@ -1018,6 +1040,15 @@ mhetesp32minikit.menu.FlashFreq.80.build.flash_freq=80m mhetesp32minikit.menu.FlashFreq.40=40MHz mhetesp32minikit.menu.FlashFreq.40.build.flash_freq=40m +mhetesp32minikit.menu.PartitionScheme.default=Default +mhetesp32minikit.menu.PartitionScheme.default.build.partitions=default +mhetesp32minikit.menu.PartitionScheme.no_ota=No OTA (Large APP) +mhetesp32minikit.menu.PartitionScheme.no_ota.build.partitions=no_ota +mhetesp32minikit.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +mhetesp32minikit.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +mhetesp32minikit.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +mhetesp32minikit.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + mhetesp32minikit.menu.UploadSpeed.921600=921600 mhetesp32minikit.menu.UploadSpeed.921600.upload.speed=921600 mhetesp32minikit.menu.UploadSpeed.115200=115200 @@ -1033,6 +1064,19 @@ mhetesp32minikit.menu.UploadSpeed.460800.upload.speed=460800 mhetesp32minikit.menu.UploadSpeed.512000.windows=512000 mhetesp32minikit.menu.UploadSpeed.512000.upload.speed=512000 +mhetesp32minikit.menu.DebugLevel.none=None +mhetesp32minikit.menu.DebugLevel.none.build.code_debug=0 +mhetesp32minikit.menu.DebugLevel.error=Error +mhetesp32minikit.menu.DebugLevel.error.build.code_debug=1 +mhetesp32minikit.menu.DebugLevel.warn=Warn +mhetesp32minikit.menu.DebugLevel.warn.build.code_debug=2 +mhetesp32minikit.menu.DebugLevel.info=Info +mhetesp32minikit.menu.DebugLevel.info.build.code_debug=3 +mhetesp32minikit.menu.DebugLevel.debug=Debug +mhetesp32minikit.menu.DebugLevel.debug.build.code_debug=4 +mhetesp32minikit.menu.DebugLevel.verbose=Verbose +mhetesp32minikit.menu.DebugLevel.verbose.build.code_debug=5 + ################################################################# esp32vn-iot-uno.name=ESP32vn IoT Uno