kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Marian Buschsieweke 2022-06-21 15:04:13 +02:00
parent 03dfad899b
commit e3f5ba90fd
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
boards/common/nrf52/Makefile.include
View File

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

3
boards/ruuvitag/Makefile.include
View File

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

3
boards/thingy52/Makefile.include
View File

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