You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/09/09 16:37:29 UTC
[5/5] incubator-mynewt-core git commit: nrf52 debug;
reset request was added to gdb script file too late.
nrf52 debug; reset request was added to gdb script file too late.
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/ea639604
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ea639604
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ea639604
Branch: refs/heads/develop
Commit: ea63960465a72784fa9dd1c51d555bad7bc0b26f
Parents: 7d3b054
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Sep 8 21:08:16 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Sep 8 21:08:16 2016 -0700
----------------------------------------------------------------------
hw/bsp/nrf52dk/nrf52dk_debug.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ea639604/hw/bsp/nrf52dk/nrf52dk_debug.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/nrf52dk_debug.sh b/hw/bsp/nrf52dk/nrf52dk_debug.sh
index 15b3391..56b009f 100755
--- a/hw/bsp/nrf52dk/nrf52dk_debug.sh
+++ b/hw/bsp/nrf52dk/nrf52dk_debug.sh
@@ -48,6 +48,10 @@ JLinkGDBServer -device nRF52 -speed 4000 -if SWD -port 3333 -singlerun > /dev/nu
set +m
echo "target remote localhost:3333" > $GDB_CMD_FILE
+# Whether target should be reset or not
+if [ ! -z "$RESET" ]; then
+ echo "mon reset" >> $GDB_CMD_FILE
+fi
if [ $SPLIT_ELF_PRESENT -eq 1 ]; then
# TODO -- this magic number 0x42000 is the location of the second image slot.
# we should either get this from a flash map file or somehow learn this from the image itself
@@ -55,10 +59,6 @@ if [ $SPLIT_ELF_PRESENT -eq 1 ]; then
fi
arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME
-# Whether target should be reset or not
-if [ ! -z "$RESET" ]; then
- echo "mon reset" >> $GDB_CMD_FILE
-fi
rm $GDB_CMD_FILE