Merge pull request #18237 from maribu/boards/thingy52

boards/{thingy52,ruuvitag}: allow OpenOCD as programmer

boards/common/nrf52/Makefile.include

@@ -8,22 +8,14 @@ ifeq (bmp,$(PROGRAMMER))
   PORT_DARWIN ?= $(wordlist 2, 2, $(sort $(wildcard /dev/tty.usbmodem*)))
 endif
 
-ifneq (,$(filter $(BOARD),ruuvitag thingy52))
-  # openocd doesn't fully work with ruuvitag and thingy52
-  PROGRAMMER ?= jlink
-  ifeq (openocd,$(PROGRAMMER))
-    $(error Cannot use OpenOCD with $(BOARD) board)
-  endif
+# set list of supported programmers
+PROGRAMMERS_SUPPORTED += openocd bmp
+# keep name of `JLINK` in sync with script jlink.sh in $(RIOTTOOLS)/jlink
+JLINK ?= JLinkExe
+ifneq (,$(command -v $(JLINK)))
+PROGRAMMER ?= jlink
 else
-  # no issues with OpenOCD for other nRF52 boards are known
-  PROGRAMMERS_SUPPORTED += openocd
-  # keep name of `JLINK` in sync with script jlink.sh in $(RIOTTOOLS)/jlink
-  JLINK ?= JLinkExe
-  ifneq (,$(command -v $(JLINK)))
-    PROGRAMMER ?= jlink
-  else
-    PROGRAMMER ?= openocd
-  endif
+PROGRAMMER ?= openocd
 endif
 
 # setup JLink for flashing
@@ -33,6 +25,3 @@ JLINK_DEVICE = nrf52
 # build from source (master > 2018, August the 13rd) is required.
 OPENOCD_DEBUG_ADAPTER ?= jlink
 OPENOCD_CONFIG = $(RIOTBOARD)/common/nrf52/dist/openocd.cfg
-
-# set list of supported programmers
-PROGRAMMERS_SUPPORTED += bmp

boards/ruuvitag/Makefile.include

@@ -7,6 +7,3 @@ endif
 
 # use shared Makefile.include
 include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include
-
-# openocd doesn't fully work with this board
-PROGRAMMERS_SUPPORTED := $(filter-out openocd,$(PROGRAMMERS_SUPPORTED))

boards/thingy52/Makefile.include

@@ -7,6 +7,3 @@ endif
 
 # use shared Makefile.include
 include $(RIOTBOARD)/common/nrf52/Makefile.include
-
-# openocd doesn't fully work with this board
-PROGRAMMERS_SUPPORTED := $(filter-out openocd,$(PROGRAMMERS_SUPPORTED))