Skip to content

boards/iotlab: rely on OPENOCD_RESET_USE_CONNECT_ASSERT_SRST #12153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aabadie merged 1 commit into from
Sep 10, 2019
Merged

boards/iotlab: rely on OPENOCD_RESET_USE_CONNECT_ASSERT_SRST #12153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions boards/common/iotlab/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B)))
export BAUD = 500000
include $(RIOTMAKE)/tools/serial.inc.mk

# call a 'reset halt' command before starting the debugger
# it is required as `connect_assert_srst` is set
export OPENOCD_DBG_START_CMD = -c 'reset halt'
# Using connect_assert_srst removes errors on flash from invalid state
export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1

# this board uses openocd
include $(RIOTMAKE)/tools/openocd.inc.mk
Expand Down
3 changes: 1 addition & 2 deletions boards/iotlab-a8-m3/dist/openocd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ source [find interface/ftdi/iotlab-usb.cfg]
source [find target/stm32f1x.cfg]

# 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 connect_assert_srst
reset_config trst_and_srst

$_TARGETNAME configure -rtos auto
3 changes: 1 addition & 2 deletions boards/iotlab-m3/dist/openocd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ source [find interface/ftdi/iotlab-usb.cfg]
source [find target/stm32f1x.cfg]

# 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 connect_assert_srst
reset_config trst_and_srst

$_TARGETNAME configure -rtos auto