kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 06:53:52 +01:00
Code Releases Activity

Merge pull request #18168 from maribu/boards/common/programmer

Browse Source 
boards/common/{nrf52,cc26xx_cc13xx}: improve default programmer selection
This commit is contained in:
Marian Buschsieweke 2022-06-08 10:15:17 +02:00 committed by GitHub
commit f256e48159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/common/cc26xx_cc13xx/Makefile.include
View File

@ -1,5 +1,9 @@
# configure the flash tool
PROGRAMMER ?= uniflash
ifneq (,$(UNIFLASH_PATH))
PROGRAMMER ?= uniflash
else
PROGRAMMER ?= openocd
endif
# uniflash and openocd programmers are supported
PROGRAMMERS_SUPPORTED += openocd uniflash

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

@ -8,7 +8,13 @@ ifeq (bmp,$(PROGRAMMER))
PORT_DARWIN ?= $(wordlist 2, 2, $(sort $(wildcard /dev/tty.usbmodem*)))
endif
PROGRAMMER ?= jlink
# 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
# setup JLink for flashing
JLINK_DEVICE = nrf52
# setup OpenOCD for flashing. Version 0.10 of OpenOCD doesn't contain support