mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccoll...@apache.org
Subject [2/4] incubator-mynewt-core git commit: rb-nano2 - Use OpenOCD's cmsis-dap.cfg; not ours.
Date Wed, 09 Nov 2016 22:46:10 GMT
rb-nano2 - 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/c63a0831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c63a0831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c63a0831

Branch: refs/heads/develop
Commit: c63a083158b07b75143b2b88cf9acf24713b89c6
Parents: 7ad9747
Author: Christopher Collins <ccollins@apache.org>
Authored: Wed Nov 9 14:02:29 2016 -0800
Committer: Christopher Collins <ccollins@apache.org>
Committed: Wed Nov 9 14:45:49 2016 -0800

----------------------------------------------------------------------
 hw/bsp/rb-nano2/cmsis-dap.cfg        | 12 ------------
 hw/bsp/rb-nano2/rb-nano2_debug.sh    |  2 +-
 hw/bsp/rb-nano2/rb-nano2_download.sh |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c63a0831/hw/bsp/rb-nano2/cmsis-dap.cfg
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/cmsis-dap.cfg b/hw/bsp/rb-nano2/cmsis-dap.cfg
deleted file mode 100644
index 7251280..0000000
--- a/hw/bsp/rb-nano2/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/c63a0831/hw/bsp/rb-nano2/rb-nano2_debug.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/rb-nano2_debug.sh b/hw/bsp/rb-nano2/rb-nano2_debug.sh
index 4ac2d94..8cd53c8 100755
--- a/hw/bsp/rb-nano2/rb-nano2_debug.sh
+++ b/hw/bsp/rb-nano2/rb-nano2_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 nrf52.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf52.cfg"
 EXTRA_JTAG_CMD="$EXTRA_JTAG_CMD; nrf52.cpu configure -event gdb-detach {resume;shutdown}"
 
 openocd_debug

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c63a0831/hw/bsp/rb-nano2/rb-nano2_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/rb-nano2_download.sh b/hw/bsp/rb-nano2/rb-nano2_download.sh
index f027618..d772862 100755
--- a/hw/bsp/rb-nano2/rb-nano2_download.sh
+++ b/hw/bsp/rb-nano2/rb-nano2_download.sh
@@ -31,7 +31,7 @@
 
 . $CORE_PATH/hw/scripts/openocd.sh
 
-CFG="-s $BSP_PATH -f cmsis-dap.cfg -f nrf52.cfg"
+CFG="-f interface/cmsis-dap.cfg -f target/nrf52.cfg"
 
 if [ "$MFG_IMAGE" ]; then
     FLASH_OFFSET=0


Mime
View raw message