Merge pull request #8475 from aabadie/pr/common-stlink

boards/stm32: use common place of openocd config files for all boards using stlink

boards/b-l072z-lrwan1/Makefile.include

@@ -9,8 +9,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 
+# this board has an on-board ST-link adapter
 export DEBUG_ADAPTER ?= stlink
-export STLINK_VERSION ?= 2-1
 
 # call a 'reset halt' command before starting the debugger
 export OPENOCD_DBG_START_CMD = -c 'reset halt'

boards/b-l475e-iot01a/Makefile.include

@@ -9,8 +9,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 
+# this board has an on-board ST-link adapter
 export DEBUG_ADAPTER ?= stlink
-export STLINK_VERSION ?= 2-1
 
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk

boards/b-l475e-iot01a/dist/openocd.cfg

-source [find target/stm32l4x.cfg]
-
-reset_config srst_only

boards/common/nucleo/Makefile.include

@@ -8,34 +8,12 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 # configure the serial terminal
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
+
+# setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 
-# all Nucleo boards have an on-board ST-link v2-1 adapter
+# all Nucleo boards have an on-board ST-link adapter
 export DEBUG_ADAPTER ?= stlink
-export STLINK_VERSION ?= 2-1
-
-# select OpenOCD configuration depending on CPU type
-ifeq (,$(OPENOCD_CONFIG))
-  ifeq ($(CPU),stm32f0)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f0.cfg
-  else ifeq ($(CPU),stm32f1)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f1.cfg
-  else ifeq ($(CPU),stm32f2)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f2.cfg
-  else ifeq ($(CPU),stm32f3)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f3.cfg
-  else ifeq ($(CPU),stm32f4)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f4.cfg
-  else ifeq ($(CPU),stm32f7)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-f7.cfg
-  else ifeq ($(CPU),stm32l0)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l0.cfg
-  else ifeq ($(CPU),stm32l1)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l1.cfg
-  else ifeq ($(CPU),stm32l4)
-    export OPENOCD_CONFIG := $(RIOTBOARD)/common/nucleo/dist/openocd-l4.cfg
-  endif
-endif
 
-# this board uses openocd
+# nucleo boards use openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk

boards/maple-mini/Makefile.include

@@ -10,7 +10,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 export DEBUG_ADAPTER ?= stlink
-export STLINK_VERSION ?= 2-1
 
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk

boards/maple-mini/dist/openocd.cfg

-source [find target/stm32f1x.cfg]
-
-reset_config srst_only

boards/stm32f3discovery/dist/openocd.cfg

-source [find target/stm32f3x.cfg]
-
-reset_config srst_only
-
-$_TARGETNAME configure -rtos auto

boards/stm32f769i-disco/Makefile.include

@@ -9,8 +9,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 
+# this board has an on-board ST-link adapter
 export DEBUG_ADAPTER ?= stlink
-export STLINK_VERSION ?= 2-1
 
 # this board uses openocd
 include $(RIOTMAKE)/tools/openocd.inc.mk

makefiles/tools/openocd-adapters/stlink.inc.mk

 # ST-Link debug adapter
+# Use st-link v2-1 by default
+STLINK_VERSION ?= 2-1
+
 # Use STLINK_VERSION to select which stlink version is used
 OPENOCD_ADAPTER_INIT ?= \
   -c 'source [find interface/stlink-v$(STLINK_VERSION).cfg]' \
@@ -8,3 +11,14 @@ ifneq (,$(DEBUG_ADAPTER_ID))
   OPENOCD_ADAPTER_INIT += -c 'hla_serial $(DEBUG_ADAPTER_ID)'
 endif
 export OPENOCD_ADAPTER_INIT
+
+# if no openocd specific configuration file, check for default locations:
+# 1. Using the default dist/openocd.cfg (automatically set by openocd.sh)
+# 2. Using the common cpu specific config file
+ifeq (,$(OPENOCD_CONFIG))
+  # if no openocd default configuration is provided by the board,
+  # use the STM32 common one
+  ifeq (0,$(words $(wildcard $(RIOTBOARD)/$(BOARD)/dist/openocd.cfg)))
+    export OPENOCD_CONFIG := $(RIOTBASE)/boards/common/stm32/dist/$(CPU).cfg
+  endif
+endif