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

dist/tools/jlink: use RIOTTOOLS variable

Browse Source
This commit is contained in:
Gaëtan Harter 2018-05-04 11:48:27 +02:00
parent 5e053bffe9
commit b0b2835503
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/tools/jlink/jlink.sh vendored
View File

@ -59,7 +59,7 @@ _JLINK_SERVER=JLinkGDBServer
_JLINK_IF=SWD _JLINK_IF=SWD
_JLINK_SPEED=2000 _JLINK_SPEED=2000
# default terminal frontend # default terminal frontend
_JLINK_TERMPROG=${RIOTBASE}/dist/tools/pyterm/pyterm _JLINK_TERMPROG=${RIOTTOOLS}/pyterm/pyterm
_JLINK_TERMFLAGS="-ts 19021" _JLINK_TERMFLAGS="-ts 19021"
# #
@ -164,7 +164,7 @@ do_flash() {
if [ ! -z "${JLINK_POST_FLASH}" ]; then if [ ! -z "${JLINK_POST_FLASH}" ]; then
printf "${JLINK_POST_FLASH}\n" >> ${BINDIR}/burn.seg printf "${JLINK_POST_FLASH}\n" >> ${BINDIR}/burn.seg
fi fi
cat ${RIOTBASE}/dist/tools/jlink/reset.seg >> ${BINDIR}/burn.seg cat ${RIOTTOOLS}/jlink/reset.seg >> ${BINDIR}/burn.seg
# flash device # flash device
sh -c "${JLINK} ${JLINK_SERIAL} \ sh -c "${JLINK} ${JLINK_SERIAL} \
-device '${JLINK_DEVICE}' \ -device '${JLINK_DEVICE}' \
@ -218,7 +218,7 @@ do_reset() {
-speed '${JLINK_SPEED}' \ -speed '${JLINK_SPEED}' \
-if '${JLINK_IF}' \ -if '${JLINK_IF}' \
-jtagconf -1,-1 \ -jtagconf -1,-1 \
-commandfile '${RIOTBASE}/dist/tools/jlink/reset.seg'" -commandfile '${RIOTTOOLS}/jlink/reset.seg'"
} }
do_term() { do_term() {
@ -245,7 +245,7 @@ do_term() {
-speed '${JLINK_SPEED}' \ -speed '${JLINK_SPEED}' \
-if '${JLINK_IF}' \ -if '${JLINK_IF}' \
-jtagconf -1,-1 \ -jtagconf -1,-1 \
-commandfile '${RIOTBASE}/dist/tools/jlink/term.seg' & \ -commandfile '${RIOTTOOLS}/jlink/term.seg' & \
echo \$! > $JLINK_PIDFILE" & echo \$! > $JLINK_PIDFILE" &
sh -c "${JLINK_TERMPROG} ${JLINK_TERMFLAGS}" sh -c "${JLINK_TERMPROG} ${JLINK_TERMFLAGS}"