Skip to content

Commit 881bd93

Browse files
authored
Merge pull request #447 from adafruit/include-flash_args-artifact
include flash_args to artifact
2 parents 3419f43 + 25e2274 commit 881bd93

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ports/espressif/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ string(FIND ${BOARD_SDKCONFIG_CONTENTS} "partitions-4MB-noota.csv" MATCH_INDEX)
4848
if(NOT MATCH_INDEX EQUAL -1)
4949
file(APPEND ${CMAKE_BINARY_DIR}/tinyuf2.postbuild.sh
5050
"echo \"Creating combined-ota.bin\"\n"
51-
"gen_esp32part.py ${CMAKE_CURRENT_LIST_DIR}/partitions-4MB.csv ${CMAKE_BINARY_DIR}/partition_table/partitions-table-4MB-ota.bin\n"
52-
"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-4MB-ota.bin/g')\n"
53-
"cp combined_ota.bin ${ARTIFACT_PATH}/combined_ota.bin\n"
51+
"gen_esp32part.py ${CMAKE_CURRENT_LIST_DIR}/partitions-4MB.csv ${CMAKE_BINARY_DIR}/partition_table/partitions-table-ota.bin\n"
52+
"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"
53+
"cp ${CMAKE_BINARY_DIR}/partition_table/partitions-table-ota.bin ${ARTIFACT_PATH}/partitions-table-ota.bin\n"
54+
"cp combined-ota.bin ${ARTIFACT_PATH}/combined-ota.bin\n"
5455
)
5556
endif()
5657

@@ -62,6 +63,7 @@ add_custom_command(TARGET app POST_BUILD
6263
# Post build: copy binaries for artifact
6364
add_custom_command(TARGET app POST_BUILD
6465
COMMAND ${CMAKE_COMMAND} -E echo "Copy binaries for artifact"
66+
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/flash_args ${ARTIFACT_PATH}/flash_args
6567
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bootloader/bootloader.bin ${ARTIFACT_PATH}/bootloader.bin
6668
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/ota_data_initial.bin ${ARTIFACT_PATH}/ota_data_initial.bin
6769
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/partition_table/partition-table.bin ${ARTIFACT_PATH}/partition-table.bin

0 commit comments

Comments
 (0)