mkiiskila closed pull request #1121: Put extra jtag commands at end of command
URL: https://github.com/apache/mynewt-core/pull/1121
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/scripts/jlink.sh b/hw/scripts/jlink.sh
index d5ad273dd8..8a75502a5a 100755
--- a/hw/scripts/jlink.sh
+++ b/hw/scripts/jlink.sh
@@ -53,7 +53,7 @@ jlink_load () {
# downloading somewhere in the flash. So need to figure out how to tell it
# not to do that, or report failure if gdb fails to write this file
#
- echo "shell sh -c \"trap '' 2; $JLINK_GDB_SERVER $EXTRA_JTAG_CMD -device
$JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun &\" " > $GDB_CMD_FILE
+ echo "shell sh -c \"trap '' 2; $JLINK_GDB_SERVER -device $JLINK_DEV -speed
1000 -if SWD -port 3333 -singlerun $EXTRA_JTAG_CMD &\" " > $GDB_CMD_FILE
echo "target remote localhost:3333" >> $GDB_CMD_FILE
echo "mon reset" >> $GDB_CMD_FILE
echo "restore $FILE_NAME binary $FLASH_OFFSET" >> $GDB_CMD_FILE
@@ -129,13 +129,13 @@ jlink_debug() {
# Launch jlink server in a separate command interpreter, to make
# sure it doesn't get killed by Ctrl-C signal from bash.
#
- $COMSPEC /C "start $COMSPEC /C $JLINK_GDB_SERVER $EXTRA_JTAG_CMD
-device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun"
+ $COMSPEC /C "start $COMSPEC /C $JLINK_GDB_SERVER -device
$JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun $EXTRA_JTAG_CMD"
else
#
# Block Ctrl-C from getting passed to jlink server.
#
set -m
- $JLINK_GDB_SERVER $EXTRA_JTAG_CMD -device $JLINK_DEV -speed 4000
-if SWD -port 3333 -singlerun > /dev/null &
+ $JLINK_GDB_SERVER -device $JLINK_DEV -speed 4000 -if SWD -port
3333 -singlerun $EXTRA_JTAG_CMD > /dev/null &
set +m
fi
@@ -155,7 +155,7 @@ jlink_debug() {
rm $GDB_CMD_FILE
fi
else
- $JLINK_GDB_SERVER $EXTRA_JTAG_CMD -device $JLINK_DEV -speed 4000 -if
SWD -port 3333 -singlerun
+ $JLINK_GDB_SERVER -device $JLINK_DEV -speed 4000 -if SWD -port 3333
-singlerun $EXTRA_JTAG_CMD
fi
return 0
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
