Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boards/nRF52xx: correctly set JLINK_DEVICE #20599

Merged
merged 1 commit into from
Apr 22, 2024
Merged

boards/nRF52xx: correctly set JLINK_DEVICE #20599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions boards/common/nrf52/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions cpu/nrf52/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading