Skip to content

Commit 778ecaf

Browse files
authored
Upload: OpenOCD: Honor OUTPUT_EXT for flash (#330)
In OpenOCD flash, if OUTPUT_EXT is defined in targets.json5, use image file with this extension <target>.<OUTPUT_EXT> for flash, or default to <target>.elf.
1 parent 88de6a1 commit 778ecaf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/cmake/upload_methods/UploadMethodOPENOCD.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function(gen_upload_target TARGET_NAME BIN_FILE)
4848
${OPENOCD_CHIP_CONFIG_COMMANDS}
4949
${OPENOCD_ADAPTER_SERIAL_COMMAND}
5050
-c "gdb_port disabled" # Don't start a GDB server when just programming
51-
-c "program $<TARGET_FILE:${TARGET_NAME}> reset exit"
51+
-c "program $<IF:$<BOOL:${MBED_OUTPUT_EXT}>,${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_BASE_NAME:${TARGET_NAME}>.${MBED_OUTPUT_EXT},$<TARGET_FILE:${TARGET_NAME}>> reset exit"
5252
VERBATIM)
5353

5454
add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})

0 commit comments

Comments
 (0)