You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/09 22:46:11 UTC
[3/4] incubator-mynewt-core git commit: nrf51-blenano - Use OpenOCD's
cmsis-dap.cfg; not ours.
nrf51-blenano - Use OpenOCD's cmsis-dap.cfg; not ours.
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/f5c99806
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f5c99806
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f5c99806
Branch: refs/heads/develop
Commit: f5c998062f7bec8075ae06f6c94a13fd179d50e5
Parents: c63a083
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Nov 9 14:08:48 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Nov 9 14:45:49 2016 -0800
----------------------------------------------------------------------
hw/bsp/nrf51-blenano/cmsis-dap.cfg | 12 ------------
hw/bsp/nrf51-blenano/nrf51dk_debug.sh | 2 +-
hw/bsp/nrf51-blenano/nrf51dk_download.sh | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f5c99806/hw/bsp/nrf51-blenano/cmsis-dap.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/cmsis-dap.cfg b/hw/bsp/nrf51-blenano/cmsis-dap.cfg
deleted file mode 100644
index 7251280..0000000
--- a/hw/bsp/nrf51-blenano/cmsis-dap.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# ARM CMSIS-DAP compliant adapter
-#
-# http://www.keil.com/support/man/docs/dapdebug/
-#
-
-interface cmsis-dap
-
-#set WORKAREASIZE 0x2000
-
-# Optionally specify the serial number of CMSIS-DAP usb device.
-#cmsis_dap_serial 02200201E6661E601B98E3B9
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f5c99806/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/nrf51dk_debug.sh b/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
index 4ca9760..10e8408 100755
--- a/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
+++ b/hw/bsp/nrf51-blenano/nrf51dk_debug.sh
@@ -30,7 +30,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
FILE_NAME=$BIN_BASENAME.elf
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf51.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf51.cfg"
EXTRA_JTAG_CMD="$EXTRA_JTAG_CMD; nrf51.cpu configure -event gdb-detach {resume;shutdown}"
openocd_debug
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f5c99806/hw/bsp/nrf51-blenano/nrf51dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/nrf51dk_download.sh b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
index af3f7bd..1f1d5de 100755
--- a/hw/bsp/nrf51-blenano/nrf51dk_download.sh
+++ b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
@@ -31,7 +31,7 @@
. $CORE_PATH/hw/scripts/openocd.sh
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf51.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf51.cfg"
if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0