summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorroblabla <unfiltered@roblab.la>2021-02-19 19:44:51 +0100
committerroblabla <unfiltered@roblab.la>2021-02-19 19:44:51 +0100
commit9f6d1c69485abe31f5fe688a863039cc42aa7858 (patch)
tree033f814097a75d6d931308591d57dd1751978f04 /src/CMakeLists.txt
parent324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff)
Flash correct file name
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 78f7cebb..ce51f3e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -831,7 +831,7 @@ if (USE_JLINK)
COMMAND ${NRFJPROG} --program ${EXECUTABLE_FILE_NAME}.hex -f ${NRF_TARGET} --sectorerase
COMMAND sleep 0.5s
COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET}
- COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+ COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
)
elseif (USE_GDB_CLIENT)
@@ -841,8 +841,8 @@ elseif (USE_GDB_CLIENT)
)
add_custom_target("FLASH_${EXECUTABLE_NAME}"
DEPENDS ${EXECUTABLE_NAME}
- COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_NAME}.hex
- COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+ COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_FILE_NAME}.hex
+ COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
)
elseif (USE_OPENOCD)
if (USE_CMSIS_DAP)
@@ -867,10 +867,10 @@ elseif (USE_OPENOCD)
-c 'transport select swd'
-c 'source [find target/nrf52.cfg]'
-c 'halt'
- -c "program \"${EXECUTABLE_NAME}.hex\""
+ -c "program \"${EXECUTABLE_FILE_NAME}.hex\""
-c 'reset'
-c 'shutdown'
- COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+ COMMENT "flashing ${EXECUTABLE_BIN_NAME}.hex"
)
else ()
add_custom_target(FLASH_ERASE
@@ -879,8 +879,8 @@ elseif (USE_OPENOCD)
)
add_custom_target("FLASH_${EXECUTABLE_NAME}"
DEPENDS ${EXECUTABLE_NAME}
- COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_NAME}.hex\"" -c reset -c shutdown
- COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+ COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_FILE_NAME}.hex\"" -c reset -c shutdown
+ COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
)
endif ()
endif ()