Partiton table self updating

Author: 203Null

ports/espressif/CMakeLists.txt

@@ -31,32 +31,8 @@ cmake_print_variables(GIT_VERSION GIT_SUBMODULE_VERSIONS)
 
 project(tinyuf2)
 
-# Create post-build script for combined.bin / combined-ota.bin
-file(WRITE ${CMAKE_BINARY_DIR}/tinyuf2.postbuild.sh
-  "#!/bin/bash\n"
-  "echo \"Creating combined.bin\"\n"
-  "esptool.py --chip ${IDF_TARGET} merge_bin --output combined.bin $(tr '\\n' ' ' < ${CMAKE_BINARY_DIR}/flash_args)\n"
-)
-
-# check if board is 4MB flash and create combined-ota.bin
-file(READ ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/sdkconfig BOARD_SDKCONFIG_CONTENTS)
-string(FIND ${BOARD_SDKCONFIG_CONTENTS} "partitions-4MB-noota.csv" MATCH_INDEX)
-if(NOT MATCH_INDEX EQUAL -1)
-  file(APPEND ${CMAKE_BINARY_DIR}/tinyuf2.postbuild.sh
-    "echo \"Creating combined-ota.bin\"\n"
-    "gen_esp32part.py ${CMAKE_CURRENT_LIST_DIR}/partitions-4MB.csv ${CMAKE_BINARY_DIR}/partition_table/partitions-table-ota.bin\n"
-    "esptool.py --chip ${IDF_TARGET} merge_bin --output combined-ota.bin $(tr '\\n' ' ' < ${CMAKE_BINARY_DIR}/flash_args | sed 's/partition-table.bin/partitions-table-ota.bin/g')\n"
-    "cp ${CMAKE_BINARY_DIR}/partition_table/partitions-table-ota.bin ${ARTIFACT_PATH}/partitions-table-ota.bin\n"
-    "cp combined-ota.bin ${ARTIFACT_PATH}/combined-ota.bin\n"
-    )
-endif()
-
-# Read flash_args file at build time and create combined.bin
 add_custom_command(TARGET app POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E echo "Creating combined.bin"
-  COMMAND ${Python_EXECUTABLE} -c "import subprocess, os; content = open('flash_args', 'r').read().replace('\\n', ' '); cmd = ['python', '-m', 'esptool', '--chip', '${IDF_TARGET}', 'merge_bin', '--output', 'combined.bin'] + content.split(); subprocess.run(cmd, env=os.environ)"
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  VERBATIM
   )
 
 # Post build: copy binaries for artifact
@@ -67,15 +43,6 @@ add_custom_command(TARGET app POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/ota_data_initial.bin ${ARTIFACT_PATH}/ota_data_initial.bin
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/partition_table/partition-table.bin ${ARTIFACT_PATH}/partition-table.bin
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/tinyuf2.bin ${ARTIFACT_PATH}/tinyuf2.bin
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/combined.bin ${ARTIFACT_PATH}/combined.bin
-  VERBATIM
-  )
-
-# flash combined.bin
-add_custom_target(combined-flash
-  DEPENDS tinyuf2.elf
-  COMMAND ${CMAKE_COMMAND} -E echo "Flashing combined.bin"
-  COMMAND esptool.py --chip ${IDF_TARGET} write_flash 0x0 combined.bin
   VERBATIM
   )
 
@@ -86,19 +53,7 @@ add_custom_target(combined-flash
 # Generate bootloader_bin.c and partition_table_bin.c as custom targets before external projects
 add_custom_target(generate_bootloader_bin
   COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} --carray -o ${CMAKE_CURRENT_LIST_DIR}/apps/update_tinyuf2/main/bootloader_bin.c ${CMAKE_BINARY_DIR}/tinyuf2.bin
-  COMMAND ${Python_EXECUTABLE} -c "
-import sys
-with open('${CMAKE_BINARY_DIR}/partition_table/partition-table.bin', 'rb') as f:
-    data = f.read()
-with open('${CMAKE_CURRENT_LIST_DIR}/apps/update_tinyuf2/main/partition_table_bin.c', 'w') as f:
-    f.write('const unsigned long partition_table_len = %d;\\n' % len(data))
-    f.write('const unsigned char partition_table[] __attribute__((aligned(16))) = {')
-    for i in range(len(data)):
-        if i % 16 == 0:
-            f.write('\\n')
-        f.write('0x%02x, ' % data[i])
-    f.write('\\n};\\n')
-"
+  COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/generate_partition_array.py ${CMAKE_BINARY_DIR}/partition_table/partition-table.bin ${CMAKE_CURRENT_LIST_DIR}/apps/update_tinyuf2/main/partition_table_bin.c
   DEPENDS tinyuf2.elf
   )
 

ports/espressif/apps/blinky/dependencies.lock

@@ -0,0 +1,10 @@
+dependencies:
+  idf:
+    source:
+      type: idf
+    version: 5.3.1
+direct_dependencies:
+- idf
+manifest_hash: f2643a0d45a12f85533cb52f8fc47a42c229fb4b9e95d0568fd637d4b3bb3ba3
+target: esp32s3
+version: 2.0.0

ports/espressif/apps/update_tinyuf2/dependencies.lock

@@ -0,0 +1,10 @@
+dependencies:
+  idf:
+    source:
+      type: idf
+    version: 5.3.1
+direct_dependencies:
+- idf
+manifest_hash: f2643a0d45a12f85533cb52f8fc47a42c229fb4b9e95d0568fd637d4b3bb3ba3
+target: esp32s3
+version: 2.0.0

ports/espressif/apps/update_tinyuf2/main/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Note: bootloader_bin.c is generated by tinyuf2 app target
-idf_component_register(SRCS ${TOP}/apps/self_update/self_update.c bootloader_bin.c
+# Note: bootloader_bin.c and partition_table_bin.c are generated by tinyuf2 app target
+idf_component_register(SRCS ${TOP}/apps/self_update/self_update.c bootloader_bin.c partition_table_bin.c
   INCLUDE_DIRS ${TOP}/src
   REQUIRES boards)