1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #5620 from jasonatran/jlink_fix

dist/tools/jlink: remove jlink prompt
This commit is contained in:
Andreas "Paul" Pauli 2017-01-25 18:47:27 +01:00 committed by GitHub
commit b101c704c7

View File

@ -152,6 +152,7 @@ do_flash() {
-device '${JLINK_DEVICE}' \ -device '${JLINK_DEVICE}' \
-speed '${JLINK_SPEED}' \ -speed '${JLINK_SPEED}' \
-if '${JLINK_IF}' \ -if '${JLINK_IF}' \
-jtagconf -1,-1 \
-commandfile '${BINDIR}/burn.seg'" -commandfile '${BINDIR}/burn.seg'"
} }
@ -197,6 +198,7 @@ do_reset() {
-device '${JLINK_DEVICE}' \ -device '${JLINK_DEVICE}' \
-speed '${JLINK_SPEED}' \ -speed '${JLINK_SPEED}' \
-if '${JLINK_IF}' \ -if '${JLINK_IF}' \
-jtagconf -1,-1 \
-commandfile '${RIOTBASE}/dist/tools/jlink/reset.seg'" -commandfile '${RIOTBASE}/dist/tools/jlink/reset.seg'"
} }