Merge branch 'jlink_extra_cmds' of https://github.com/mkiiskila/incubator-mynewt-core
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/cb23f34e Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/cb23f34e Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/cb23f34e Branch: refs/heads/master Commit: cb23f34e9b55de68078c0c2200b268cf536d003b Parents: 1080d5c 9cec095 Author: Marko Kiiskila <ma...@runtime.io> Authored: Mon May 8 18:30:54 2017 -0700 Committer: Marko Kiiskila <ma...@runtime.io> Committed: Mon May 8 18:30:54 2017 -0700 ---------------------------------------------------------------------- hw/scripts/jlink.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/cb23f34e/hw/scripts/jlink.sh ---------------------------------------------------------------------- diff --cc hw/scripts/jlink.sh index 88391b3,422c4f7..e07049b --- a/hw/scripts/jlink.sh +++ b/hw/scripts/jlink.sh @@@ -125,7 -125,7 +125,7 @@@ 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 $JLINK_GDB_SERVER -device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun" - $COMSPEC "/C start $COMSPEC /C $JLINK_GDB_SERVER $EXTRA_JTAG_CMD -device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun" ++ $COMSPEC /C "start $JLINK_GDB_SERVER $EXTRA_JTAG_CMD -device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun" else # # Block Ctrl-C from getting passed to jlink server.