Merge pull request #8977 from cladmi/pr/fix/iotlab/openocd

boards/iotlab-m3|a8: fix openocd configuration

boards/common/iotlab/Makefile.include

@@ -10,6 +10,10 @@ 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'
+
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk
 

boards/iotlab-a8-m3/dist/openocd.cfg

-interface ftdi
-ftdi_vid_pid 0x0403 0x6010
+source [find interface/ftdi/iotlab-usb.cfg]
+source [find target/stm32f1x.cfg]
 
-ftdi_layout_init 0x0c08 0x0c2b
-ftdi_layout_signal nTRST -data 0x0800
-ftdi_layout_signal nSRST -data 0x0400
+# 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
 
-source [find target/stm32f1x.cfg]
 $_TARGETNAME configure -rtos auto

boards/iotlab-m3/dist/openocd.cfg

-interface ftdi
-ftdi_vid_pid 0x0403 0x6010
+source [find interface/ftdi/iotlab-usb.cfg]
+source [find target/stm32f1x.cfg]
 
-ftdi_layout_init 0x0c08 0x0c2b
-ftdi_layout_signal nTRST -data 0x0800
-ftdi_layout_signal nSRST -data 0x0400
+# 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
 
-source [find target/stm32f1x.cfg]
 $_TARGETNAME configure -rtos auto