riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards: unexport JLINK_DEVICE variable

Browse Source
This commit is contained in:
Alexandre Abadie 2020-03-03 11:56:38 +01:00
parent 40e754c9d8
commit 1e9879fbcf
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/common/arduino-mkr/Makefile.include
View File

@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool used # setup the flash tool used
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
# in case J-Link is attached to SWD pins, use a plain CPU memory model # in case J-Link is attached to SWD pins, use a plain CPU memory model
export JLINK_DEVICE := $(MKR_JLINK_DEVICE) JLINK_DEVICE = $(MKR_JLINK_DEVICE)
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
else else
# by default, we use BOSSA to flash this board and take into account the # by default, we use BOSSA to flash this board and take into account the

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

@ -15,6 +15,6 @@ ifeq ($(PROGRAMMER),openocd)
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := nrf51822 JLINK_DEVICE = nrf51822
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
endif endif

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

@ -14,7 +14,7 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.dep
PROGRAMMER ?= jlink PROGRAMMER ?= jlink
ifeq (jlink,$(PROGRAMMER)) ifeq (jlink,$(PROGRAMMER))
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := nrf52 JLINK_DEVICE = nrf52
# special options when using SoftDevice # special options when using SoftDevice
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG))) ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))

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

@ -3,7 +3,7 @@ INCLUDES += -I$(RIOTBOARD)/common/silabs/drivers/include
PROGRAMMER ?= jlink PROGRAMMER ?= jlink
export JLINK_DEVICE ?= ${CPU_MODEL} JLINK_DEVICE ?= ${CPU_MODEL}
OPENOCD_CONFIG ?= board/efm32.cfg OPENOCD_CONFIG ?= board/efm32.cfg
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)

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

@ -11,7 +11,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing # setup JLink for flashing
include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk
export JLINK_DEVICE = $(word 2, $(SLWSTK6000B_MAINBOARD_VARS_$(BOARD_MODULE))) JLINK_DEVICE = $(word 2, $(SLWSTK6000B_MAINBOARD_VARS_$(BOARD_MODULE)))
# include board common # include board common
include $(RIOTBOARD)/common/silabs/Makefile.include include $(RIOTBOARD)/common/silabs/Makefile.include

2
boards/feather-m0/Makefile.include
View File

@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool used # setup the flash tool used
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
# in case J-Link is attached to SWD pins, use a plain CPU memory model # in case J-Link is attached to SWD pins, use a plain CPU memory model
export JLINK_DEVICE := atsamd21 JLINK_DEVICE = atsamd21
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
else else
# by default, we use BOSSA to flash this board to take into account the # by default, we use BOSSA to flash this board to take into account the

2
boards/hamilton/Makefile.include
View File

@ -1,5 +1,5 @@
# debugger config # debugger config
export JLINK_DEVICE := atsamr21e18a JLINK_DEVICE = atsamr21e18a
OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
OFLAGS := --gap-fill 0xff OFLAGS := --gap-fill 0xff

2
boards/hifive1b/Makefile.include
View File

@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing # setup JLink for flashing
# export JLINK := JLink # export JLINK := JLink
export JLINK_DEVICE := FE310 JLINK_DEVICE = FE310
export JLINK_IF := JTAG export JLINK_IF := JTAG
export FLASH_ADDR := 0x20010000 export FLASH_ADDR := 0x20010000
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk

2
boards/ikea-tradfri/Makefile.include
View File

@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := EFR32MG1PxxxF256 JLINK_DEVICE = EFR32MG1PxxxF256
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
# setup serial terminal # setup serial terminal

2
boards/openmote-b/Makefile.include
View File

@ -22,7 +22,7 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
# Special flashing and reset scripts are required due to board hardware # Special flashing and reset scripts are required due to board hardware
export FLASH_ADDR = 0x200000 export FLASH_ADDR = 0x200000
export JLINK_DEVICE = CC2538SF53 JLINK_DEVICE = CC2538SF53
export JLINK_IF = JTAG export JLINK_IF = JTAG
export JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg export JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk

2
boards/openmote-cc2538/Makefile.include
View File

@ -9,7 +9,7 @@ PROGRAMMER ?= cc2538-bsl
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := cc2538sf53 JLINK_DEVICE = cc2538sf53
export FLASH_ADDR := 0x200000 export FLASH_ADDR := 0x200000
export JLINK_IF := JTAG export JLINK_IF := JTAG
export TUI := 1 export TUI := 1

2
boards/pic32-wifire/Makefile.include
View File

@ -20,7 +20,7 @@ ifeq ($(PROGRAMMER),pic32prog)
include $(RIOTMAKE)/tools/pic32prog.inc.mk include $(RIOTMAKE)/tools/pic32prog.inc.mk
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
FLASHFILE ?= $(HEXFILE) FLASHFILE ?= $(HEXFILE)
export JLINK_DEVICE := PIC32MZ2048EFG100 JLINK_DEVICE = PIC32MZ2048EFG100
export JLINK_IF := JTAG export JLINK_IF := JTAG
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
endif endif

2
boards/sensebox_samd21/Makefile.include
View File

@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool used # setup the flash tool used
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
# in case J-Link is attached to SWD pins, use a plain CPU memory model # in case J-Link is attached to SWD pins, use a plain CPU memory model
export JLINK_DEVICE := atsamd21 JLINK_DEVICE = atsamd21
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
else else
# by default, we use BOSSA to flash this board to take into account the # by default, we use BOSSA to flash this board to take into account the

2
boards/sltb001a/Makefile.include
View File

@ -6,7 +6,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := EFR32MG1PxxxF256 JLINK_DEVICE = EFR32MG1PxxxF256
export JLINK_PRE_FLASH = r export JLINK_PRE_FLASH = r
# include board common # include board common

2
boards/slwstk6220a/Makefile.include
View File

@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup JLink for flashing # setup JLink for flashing
export JLINK_DEVICE := ezr32wg330f256 JLINK_DEVICE = ezr32wg330f256
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
# setup serial terminal # setup serial terminal