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

Merge pull request #13168 from fjmolinas/pr_iotlab_openocd

Browse Source 
boards/iotlab: add DEBUG_ADAPTER_ID openocd
This commit is contained in:
Alexandre Abadie 2020-02-05 11:30:11 +01:00 committed by GitHub
commit d6264f56c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,10 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# Using connect_assert_srst removes errors on flash from invalid state # Using connect_assert_srst removes errors on flash from invalid state
export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1 export OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
DEBUG_ADAPTER ?= iotlab
export OPENOCD_CONFIG ?= $(RIOTBOARD)/common/iotlab/dist/openocd.cfg
# this board uses openocd # this board uses openocd
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk

0
boards/iotlab-a8-m3/dist/openocd.cfg → boards/common/iotlab/dist/openocd.cfg vendored
View File

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

@ -1,7 +0,0 @@
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
reset_config trst_and_srst
$_TARGETNAME configure -rtos auto

8
makefiles/tools/openocd-adapters/iotlab.inc.mk Normal file
View File

@ -0,0 +1,8 @@
# iotlab-usb debug adapter
OPENOCD_ADAPTER_INIT ?= -c 'source [find interface/ftdi/iotlab-usb.cfg]'
# Add serial matching command, only if DEBUG_ADAPTER_ID was specified
ifneq (,$(DEBUG_ADAPTER_ID))
OPENOCD_ADAPTER_INIT += -c 'ftdi_serial $(DEBUG_ADAPTER_ID)'
endif
export OPENOCD_ADAPTER_INIT