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

Merge pull request #20599 from crasbe/pr/nrf52840_jlink

Browse Source 
boards/nRF52xx: correctly set JLINK_DEVICE
This commit is contained in:
Marian Buschsieweke 2024-04-22 11:53:15 +00:00 committed by GitHub
commit a8ffb340fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,6 @@ else
PROGRAMMER ?= openocd PROGRAMMER ?= openocd
endif endif
# setup JLink for flashing
JLINK_DEVICE = nrf52
# setup OpenOCD for flashing. Version 0.10 of OpenOCD doesn't contain support # setup OpenOCD for flashing. Version 0.10 of OpenOCD doesn't contain support
# for nrf52dk and nrf52840dk boards. To use OpenOCD with these a version # for nrf52dk and nrf52840dk boards. To use OpenOCD with these a version
# build from source (master > 2018, August the 13rd) is required. # build from source (master > 2018, August the 13rd) is required.

5
cpu/nrf52/Makefile.include
View File

@ -35,6 +35,11 @@ ifneq (,$(filter nrf52840xxaa,$(CPU_MODEL)))
RAM_LEN ?= 0x40000 RAM_LEN ?= 0x40000
endif endif
# Set the target for the JLink programmer for flashing, JLINK expects an
# underscore in the target, like "nrf52832_xxaa".
# Boards that do not use a JLink ignore the flag.
JLINK_DEVICE = $(subst xx,_xx,$(CPU_MODEL))
VECTORS_O ?= $(BINDIR)/nrf52_vectors/vectors_$(CPU_MODEL).o VECTORS_O ?= $(BINDIR)/nrf52_vectors/vectors_$(CPU_MODEL).o
include $(RIOTCPU)/nrf5x_common/Makefile.include include $(RIOTCPU)/nrf5x_common/Makefile.include