diff options
| author | Joaquim <joaquim.org@gmail.com> | 2021-02-25 09:28:25 +0000 |
|---|---|---|
| committer | Joaquim <joaquim.org@gmail.com> | 2021-02-25 09:28:25 +0000 |
| commit | ee6ce645710d1d812eb6b31141fcc8305d670e8c (patch) | |
| tree | 630dcb6ff025d03741b021b44018b2f4d5685351 | |
| parent | 8c53d0b70baa03c2b07360444a7cd0ad99bb8381 (diff) | |
| parent | 8a48850afdeba3cc163630c34300f955ee36d5cc (diff) | |
Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock
| -rw-r--r-- | src/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e24cbe0..6029f142 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -889,7 +889,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) @@ -899,8 +899,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) @@ -925,10 +925,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 @@ -937,8 +937,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 () |