riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards/iotlab: rely on OPENOCD_RESET_USE_CONNECT_ASSERT_SRST

Browse Source 
Use the new OPENOCD_RESET_USE_CONNECT_ASSERT_SRST to configure
'reset_config connect_assert_srst' when flashing and resetting only.

This removes the need for a special debug configuration and should allow
connecting to a running target again.
This commit is contained in:
Gaëtan Harter 2019-09-02 16:12:55 +02:00
parent d9b0db0d61
commit c1b32fe1f3
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/common/iotlab/Makefile.include
View File

@ -6,9 +6,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B)))
export BAUD = 500000 export BAUD = 500000
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
# call a 'reset halt' command before starting the debugger # Using connect_assert_srst removes errors on flash from invalid state
# it is required as `connect_assert_srst` is set export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
export OPENOCD_DBG_START_CMD = -c 'reset halt'
# this board uses openocd # this board uses openocd
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk

3
boards/iotlab-a8-m3/dist/openocd.cfg vendored
View File

@ -2,7 +2,6 @@ source [find interface/ftdi/iotlab-usb.cfg]
source [find target/stm32f1x.cfg] source [find target/stm32f1x.cfg]
# use combined on interfaces or targets that can't set TRST/SRST separately # use combined on interfaces or targets that can't set TRST/SRST separately
# Using connect_assert_srst removes errors on first flash reset_config trst_and_srst
reset_config trst_and_srst connect_assert_srst
$_TARGETNAME configure -rtos auto $_TARGETNAME configure -rtos auto

3
boards/iotlab-m3/dist/openocd.cfg vendored
View File

@ -2,7 +2,6 @@ source [find interface/ftdi/iotlab-usb.cfg]
source [find target/stm32f1x.cfg] source [find target/stm32f1x.cfg]
# use combined on interfaces or targets that can't set TRST/SRST separately # use combined on interfaces or targets that can't set TRST/SRST separately
# Using connect_assert_srst removes errors on first flash reset_config trst_and_srst
reset_config trst_and_srst connect_assert_srst
$_TARGETNAME configure -rtos auto $_TARGETNAME configure -rtos auto