Add partition table for 32MB ESP32_S3 targets (#2956)

nanoframework · Jun 10, 2024 · 5cdd337 · 5cdd337
1 parent d885548
commit 5cdd337
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/.vscode/tasks.TEMPLATE.json b/.vscode/tasks.TEMPLATE.json
@@ -136,7 +136,8 @@
         "2mb",
         "4mb",
         "8mb",
-        "16mb"
+        "16mb",
+        "32mb"
       ]
     },
     {

diff --git a/CMake/binutils.ESP32.cmake b/CMake/binutils.ESP32.cmake
@@ -507,6 +507,18 @@ macro(nf_setup_partition_tables_generator)
 
     endif()
 
+    if(${TARGET_SERIES_SHORT} STREQUAL "esp32s3")
+
+        # 32MB partition table for ESP32_S3
+        add_custom_command( TARGET ${NANOCLR_PROJECT_NAME}.elf POST_BUILD
+            COMMAND ${gen_partition_table} 
+            --flash-size 32MB 
+            ${CMAKE_SOURCE_DIR}/targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_32mb.csv
+            ${CMAKE_BINARY_DIR}/partitions_32mb.bin
+            COMMENT "Generate partition table for 32MB flash" )
+
+    endif()
+
     if(${TARGET_SERIES_SHORT} STREQUAL "esp32" OR 
        ${TARGET_SERIES_SHORT} STREQUAL "esp32c3" OR
        ${TARGET_SERIES_SHORT} STREQUAL "esp32h2" )

diff --git a/targets/ESP32/_IDF/esp32s3/partitions_nanoclr_16mb.csv b/targets/ESP32/_IDF/esp32s3/partitions_nanoclr_16mb.csv
@@ -8,10 +8,11 @@ nvs,      data, nvs,     0x9000,   0x6000,
 phy_init, data, phy,     0xf000,   0x1000,
 # Factory area for NanoCLR - 1664k
 factory,  app, factory,  0x10000,  0x1A0000,
-# Deployment area for Managed code 2944k, Mapping issues with deployment areas over 3.5Mb, see issue #691
+# Deployment area for Managed code 2944k
 deploy,   data, 0x84,    0x1B0000, 0x2E0000, 
 # Config data for Network, Wireless, certificates, user data  3MB
 config,   data, spiffs,  0x490000, 0x300000,
 ##########################################
+# spare from 0x790000 (8Mb free)         #
 # total size has to be 0x1000000 or less #
 ##########################################
diff --git a/targets/ESP32/_IDF/esp32s3/partitions_nanoclr_32mb.csv b/targets/ESP32/_IDF/esp32s3/partitions_nanoclr_32mb.csv
@@ -0,0 +1,18 @@
+################################################
+# ESP-IDF Partition Table for .NET nanoFramework
+# Name,  Type, SubType, Offset,  Size, 
+###############################################################################################################################
+# if you change the partitions here, make sure to update the BlockRegions array in the device BlockStorage configuration file #
+###############################################################################################################################
+nvs,      data, nvs,     0x9000,   0x6000,
+phy_init, data, phy,     0xf000,   0x1000,
+# Factory area for NanoCLR - 1664k
+factory,  app, factory,  0x10000,  0x1A0000,
+# Deployment area for Managed code 2944k
+deploy,   data, 0x84,    0x1B0000, 0x2E0000, 
+# Config data for Network, Wireless, certificates, user data 8MB
+config,   data, spiffs,  0x490000, 0x800000,
+##########################################
+# spare from 0xC90000 (19Mb free)        #
+# total size has to be 0x2000000 or less #
+##########################################
diff --git a/targets/ESP32/_IDF/esp32s3/partitions_nanoclr_8mb.csv b/targets/ESP32/_IDF/esp32s3/partitions_nanoclr_8mb.csv
@@ -8,10 +8,11 @@ nvs,      data, nvs,     0x9000,   0x6000,
 phy_init, data, phy,     0xf000,   0x1000,
 # Factory area for NanoCLR - 1664k
 factory,  app, factory,  0x10000,  0x1A0000,
-# Deployment area for Managed code 2944k, Mapping issues with deployment areas over 3.5Mb, see issue #691
-deploy,   data, 0x84,    0x1B0000, 0x300000, 
-# Config data for Network, Wireless, certificates, user data  2Mb
-config,   data, spiffs,  0x4B0000, 0x200000,  
+# Deployment area for Managed code 2944k
+deploy,   data, 0x84,    0x1B0000, 0x2E0000, 
+# Config data for Network, Wireless, certificates, user data  2MB
+config,   data, spiffs,  0x490000, 0x200000,  
 ##########################################
+# spare from 0x690000 (1.4MB free)       #
 # total size has to be 0x800000 or less  #
 ##########################################