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:28 UTC
[4/5] incubator-mynewt-core git commit: MYNEWT-241;
extra jtag params were passed incorrectly.
MYNEWT-241; extra jtag params were passed incorrectly.
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/f674c074
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f674c074
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f674c074
Branch: refs/heads/develop
Commit: f674c0748d08b760e1fece809e76ae088e4e049e
Parents: 5ed523a
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Sep 8 18:23:21 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Sep 8 20:48:20 2016 -0700
----------------------------------------------------------------------
hw/bsp/arduino_primo_nrf52/primo_download.sh | 9 +--------
hw/bsp/nrf51-blenano/nrf51dk_download.sh | 9 +--------
hw/bsp/nucleo-f401re/nucleo-f401re_download.sh | 9 +--------
.../olimex_stm32-e407_devboard_download.sh | 9 +--------
hw/bsp/stm32f4discovery/stm32f4discovery_download.sh | 9 +--------
5 files changed, 5 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f674c074/hw/bsp/arduino_primo_nrf52/primo_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/primo_download.sh b/hw/bsp/arduino_primo_nrf52/primo_download.sh
index 4eac19f..808b3ef 100755
--- a/hw/bsp/arduino_primo_nrf52/primo_download.sh
+++ b/hw/bsp/arduino_primo_nrf52/primo_download.sh
@@ -76,18 +76,11 @@ if [ $USE_OPENOCD -eq 1 ]; then
exit 1
fi
- # Extra parameters to pass to openocd
- if [ ! -z "$EXTRA_JTAG_CMD" ]; then
- EXTRA_CMD="-c $EXTRA_JTAG_CMD"
- else
- EXTRA_CMD=
- fi
-
#
# XXXX note that this is using openocd through STM32, with openocd
# which has been patched to support nrf52 flash.
#
- openocd -s $BSP_PATH -f arduino_primo.cfg $EXTRA_CMD -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
+ openocd -s $BSP_PATH -f arduino_primo.cfg -c "$EXTRA_JTAG_CMD" -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
else
echo "shell /bin/sh -c 'trap \"\" 2;JLinkGDBServer -device nRF52 -speed 4000 -if SWD -port 3333 -singlerun' & " > $GDB_CMD_FILE
echo "target remote localhost:3333" >> $GDB_CMD_FILE
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f674c074/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 38ae717..172b7a2 100755
--- a/hw/bsp/nrf51-blenano/nrf51dk_download.sh
+++ b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
@@ -68,18 +68,11 @@ if [ ! -f $FILE_NAME ]; then
exit 1
fi
-# Extra parameters to pass to openocd
-if [ ! -z "$EXTRA_JTAG_CMD" ]; then
- EXTRA_CMD="-c $EXTRA_JTAG_CMD"
-else
- EXTRA_CMD=
-fi
-
# XXX for some reason JLinkExe overwrites flash at offset 0 when
# 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 /bin/sh -c 'trap \"\" 2;openocd -s $BSP_PATH -f cmsis-dap.cfg $EXTRA_CMD -f nrf51.cfg' &" > $GDB_CMD_FILE
+echo "shell /bin/sh -c 'trap \"\" 2;openocd -s $BSP_PATH -f cmsis-dap.cfg -c \"$EXTRA_JTAG_CMD\" -f nrf51.cfg' &" > $GDB_CMD_FILE
echo "target remote localhost:3333" >> $GDB_CMD_FILE
echo "monitor reset halt" >> $GDB_CMD_FILE
echo "monitor flash write_image erase $FILE_NAME $FLASH_OFFSET" >> $GDB_CMD_FILE
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f674c074/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh b/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
index 956b74d..d34e81a 100755
--- a/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
+++ b/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
@@ -49,12 +49,5 @@ else
fi
echo "Downloading" $FILE_NAME "to" $FLASH_OFFSET
-# Extra parameters to pass to openocd
-if [ ! -z "$EXTRA_JTAG_CMD" ]; then
- EXTRA_CMD="-c $EXTRA_JTAG_CMD"
-else
- EXTRA_CMD=
-fi
-
-openocd -f board/st_nucleo_f4.cfg $EXTRA_CMD -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
+openocd -f board/st_nucleo_f4.cfg -c "$EXTRA_JTAG_CMD" -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f674c074/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh b/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
index ece303e..2d8c86c 100755
--- a/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
+++ b/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
@@ -50,12 +50,5 @@ fi
echo "Downloading" $FILE_NAME "to" $FLASH_OFFSET
-# Extra parameters to pass to openocd
-if [ ! -z "$EXTRA_JTAG_CMD" ]; then
- EXTRA_CMD="-c $EXTRA_JTAG_CMD"
-else
- EXTRA_CMD=
-fi
-
-openocd -f interface/ftdi/olimex-arm-usb-tiny-h.cfg -s $BSP_PATH -f f407.cfg $EXTRA_CMD -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
+openocd -f interface/ftdi/olimex-arm-usb-tiny-h.cfg -s $BSP_PATH -f f407.cfg -c "$EXTRA_JTAG_CMD" -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f674c074/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh b/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
index a212a6f..133f637 100644
--- a/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
+++ b/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
@@ -50,12 +50,5 @@ fi
echo "Downloading" $FILE_NAME "to" $FLASH_OFFSET
-# Extra parameters to pass to openocd
-if [ ! -z "$EXTRA_JTAG_CMD" ]; then
- EXTRA_CMD="-c $EXTRA_JTAG_CMD"
-else
- EXTRA_CMD=
-fi
-
-openocd -f board/stm32f4discovery.cfg $EXTRA_CMD -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown
+openocd -f board/stm32f4discovery.cfg -c "$EXTRA_JTAG_CMD" -c init -c "reset halt" -c "flash write_image erase $FILE_NAME $FLASH_OFFSET" -c "reset run" -c shutdown