diff --git a/boards/acd52832/Makefile.include b/boards/acd52832/Makefile.include index 7464e87d14a5b..a39c1a2d69b11 100644 --- a/boards/acd52832/Makefile.include +++ b/boards/acd52832/Makefile.include @@ -1,4 +1,7 @@ # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB0 +# setup JLink for flashing +JLINK_DEVICE = nrf52832_xxaa + include $(RIOTBOARD)/common/nrf52/Makefile.include diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include index 82ab6d06433ae..8e17d28b28b14 100644 --- 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/boards/dwm1001/Makefile.include b/boards/dwm1001/Makefile.include index 5008dc2c526f5..e8562a4fbf529 100644 --- a/boards/dwm1001/Makefile.include +++ b/boards/dwm1001/Makefile.include @@ -1,2 +1,5 @@ +# setup JLink for flashing +JLINK_DEVICE = nrf52832_xxaa + # include common configuration for nrf52 based boards include $(RIOTBOARD)/common/nrf52/Makefile.include diff --git a/boards/e104-bt5010a-tb/Makefile.include b/boards/e104-bt5010a-tb/Makefile.include index f3dda365ba021..10a2f27968087 100644 --- a/boards/e104-bt5010a-tb/Makefile.include +++ b/boards/e104-bt5010a-tb/Makefile.include @@ -1 +1,4 @@ +# setup JLink for flashing +JLINK_DEVICE = nrf52810_xxaa + include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.include diff --git a/boards/e104-bt5011a-tb/Makefile.include b/boards/e104-bt5011a-tb/Makefile.include index f3dda365ba021..7abd93743d103 100644 --- a/boards/e104-bt5011a-tb/Makefile.include +++ b/boards/e104-bt5011a-tb/Makefile.include @@ -1 +1,4 @@ +# setup JLink for flashing +JLINK_DEVICE = nrf52811_xxaa + include $(RIOTBOARD)/common/e104-bt50xxa-tb/Makefile.include diff --git a/boards/nrf52840dk/Makefile.include b/boards/nrf52840dk/Makefile.include index 7a7fc118c90a6..a03eb414c33f7 100644 --- a/boards/nrf52840dk/Makefile.include +++ b/boards/nrf52840dk/Makefile.include @@ -6,4 +6,7 @@ TTY_BOARD_FILTER := --model J-Link # the debug adapter DEBUG_ADAPTER_ID_IS_TTY_SERIAL := 1 +# setup JLink for flashing +JLINK_DEVICE = nrf52840_xxaa + include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include index c86c0c8eaba8e..30b1e9beb4608 100644 --- a/boards/nrf52dk/Makefile.include +++ b/boards/nrf52dk/Makefile.include @@ -2,4 +2,7 @@ # USB serials to only select the UART bridge of integrated J-Link debugger. TTY_BOARD_FILTER := --model J-Link +# setup JLink for flashing +JLINK_DEVICE = nrf52832_xxaa + include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include diff --git a/boards/ruuvitag/Makefile.include b/boards/ruuvitag/Makefile.include index 03e3beeae017c..75b1688414f93 100644 --- a/boards/ruuvitag/Makefile.include +++ b/boards/ruuvitag/Makefile.include @@ -5,5 +5,8 @@ ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE))) RIOT_TERMINAL ?= jlink endif +# setup JLink for flashing +JLINK_DEVICE = nrf52832_xxaa + # use shared Makefile.include include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include diff --git a/boards/waveshare-nrf52840-eval-kit/Makefile.include b/boards/waveshare-nrf52840-eval-kit/Makefile.include index 375f22da75908..a78d8cf290083 100644 --- a/boards/waveshare-nrf52840-eval-kit/Makefile.include +++ b/boards/waveshare-nrf52840-eval-kit/Makefile.include @@ -1 +1,4 @@ +# setup JLink for flashing +JLINK_DEVICE = nrf52840_xxaa + include $(RIOTBOARD)/common/nrf52/Makefile.include