Merge pull request #20599 from crasbe/pr/nrf52840_jlink

boards/nRF52xx: correctly set JLINK_DEVICE
RIOT-OS · Apr 22, 2024 · a8ffb34 · a8ffb34
2 parents 5a7bcc9 + 6f0e81f
commit a8ffb34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include
@@ -18,8 +18,6 @@ else
   PROGRAMMER ?= openocd
 endif
 
-# setup JLink for flashing
-JLINK_DEVICE = nrf52
 # 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
 # build from source (master > 2018, August the 13rd) is required.

diff --git a/cpu/nrf52/Makefile.include b/cpu/nrf52/Makefile.include
@@ -35,6 +35,11 @@ ifneq (,$(filter nrf52840xxaa,$(CPU_MODEL)))
   RAM_LEN ?= 0x40000
 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
 
 include $(RIOTCPU)/nrf5x_common/Makefile.include