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: remove exports of jlink related variables #13567

Merged
merged 13 commits into from
Mar 10, 2020
Merged

boards: remove exports of jlink related variables #13567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
40e754c
makefiles/jlink: only export JLINK_DEVICE when required
aabadie Mar 3, 2020
1e9879f
boards: unexport JLINK_DEVICE variable
aabadie Mar 3, 2020
9c2e5c9
ci/buildsystem_check: ensure JLINK_DEVICE is not exported
aabadie Mar 3, 2020
04d32e9
makefiles/jlink: export JLINK_IF to required targets
aabadie Mar 3, 2020
8400589
boards: don't export JLINK_IF
aabadie Mar 3, 2020
c586db5
ci/buildsystem_check: ensure JLINK_IF is not exported
aabadie Mar 3, 2020
5458f4d
makefiles/jlink: export JLINK_RESET_FILE to required targets
aabadie Mar 3, 2020
92bbe75
boards/openmote-b: don't export JLINK_RESET_FILE
aabadie Mar 3, 2020
5e85994
ci/buildsystem_check: force no export of JLINK_RESET_FILE
aabadie Mar 3, 2020
8489a0a
boards: don't export FLASH_ADDR
aabadie Mar 3, 2020
6560a1f
makefiles/jlink: export JLINK_PRE_FLASH to flash targets
aabadie Mar 3, 2020
c49ad27
boards: don't export JLINK_PRE_FLASH
aabadie Mar 3, 2020
ad5b9d7
ci/buildsystem_check: force no export of JLINK_PRE_FLASH
aabadie Mar 3, 2020
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
Prev Previous commit
Next Next commit
boards: unexport JLINK_DEVICE variable
  • Loading branch information
@aabadie
aabadie committed Mar 10, 2020
commit 1e9879fbcff3bd7ecda42ba2c54d6a88547c515c
2 changes: 1 addition & 1 deletion boards/common/arduino-mkr/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool used
ifeq ($(PROGRAMMER),jlink)
# 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
else
# by default, we use BOSSA to flash this board and take into account the
Expand Down
2 changes: 1 addition & 1 deletion boards/common/nrf51/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ ifeq ($(PROGRAMMER),openocd)
include $(RIOTMAKE)/tools/openocd.inc.mk
else ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing
export JLINK_DEVICE := nrf51822
JLINK_DEVICE = nrf51822
include $(RIOTMAKE)/tools/jlink.inc.mk
endif
2 changes: 1 addition & 1 deletion boards/common/nrf52/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.dep
PROGRAMMER ?= jlink
ifeq (jlink,$(PROGRAMMER))
# setup JLink for flashing
export JLINK_DEVICE := nrf52
JLINK_DEVICE = nrf52

# special options when using SoftDevice
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
Expand Down
2 changes: 1 addition & 1 deletion boards/common/silabs/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ INCLUDES += -I$(RIOTBOARD)/common/silabs/drivers/include

PROGRAMMER ?= jlink

export JLINK_DEVICE ?= ${CPU_MODEL}
JLINK_DEVICE ?= ${CPU_MODEL}
OPENOCD_CONFIG ?= board/efm32.cfg

ifeq ($(PROGRAMMER),jlink)
Expand Down
2 changes: 1 addition & 1 deletion boards/common/slwstk6000b/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk

# setup JLink for flashing
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 $(RIOTBOARD)/common/silabs/Makefile.include
2 changes: 1 addition & 1 deletion boards/feather-m0/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool used
ifeq ($(PROGRAMMER),jlink)
# 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
else
# by default, we use BOSSA to flash this board to take into account the
Expand Down
2 changes: 1 addition & 1 deletion boards/hamilton/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# debugger config
export JLINK_DEVICE := atsamr21e18a
JLINK_DEVICE = atsamr21e18a
OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
OFLAGS := --gap-fill 0xff

Expand Down
2 changes: 1 addition & 1 deletion boards/hifive1b/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk

# setup JLink for flashing
# export JLINK := JLink
export JLINK_DEVICE := FE310
JLINK_DEVICE = FE310
export JLINK_IF := JTAG
export FLASH_ADDR := 0x20010000
include $(RIOTMAKE)/tools/jlink.inc.mk
Expand Down
2 changes: 1 addition & 1 deletion boards/ikea-tradfri/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))

# setup JLink for flashing
export JLINK_DEVICE := EFR32MG1PxxxF256
JLINK_DEVICE = EFR32MG1PxxxF256
include $(RIOTMAKE)/tools/jlink.inc.mk

# setup serial terminal
Expand Down
2 changes: 1 addition & 1 deletion boards/openmote-b/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
else ifeq ($(PROGRAMMER),jlink)
# Special flashing and reset scripts are required due to board hardware
export FLASH_ADDR = 0x200000
export JLINK_DEVICE = CC2538SF53
JLINK_DEVICE = CC2538SF53
export JLINK_IF = JTAG
export JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg
include $(RIOTMAKE)/tools/jlink.inc.mk
Expand Down
2 changes: 1 addition & 1 deletion boards/openmote-cc2538/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PROGRAMMER ?= cc2538-bsl

ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing
export JLINK_DEVICE := cc2538sf53
JLINK_DEVICE = cc2538sf53
export FLASH_ADDR := 0x200000
export JLINK_IF := JTAG
export TUI := 1
Expand Down
2 changes: 1 addition & 1 deletion boards/pic32-wifire/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ifeq ($(PROGRAMMER),pic32prog)
include $(RIOTMAKE)/tools/pic32prog.inc.mk
else ifeq ($(PROGRAMMER),jlink)
FLASHFILE ?= $(HEXFILE)
export JLINK_DEVICE := PIC32MZ2048EFG100
JLINK_DEVICE = PIC32MZ2048EFG100
export JLINK_IF := JTAG
include $(RIOTMAKE)/tools/jlink.inc.mk
endif
2 changes: 1 addition & 1 deletion boards/sensebox_samd21/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool used
ifeq ($(PROGRAMMER),jlink)
# 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
else
# by default, we use BOSSA to flash this board to take into account the
Expand Down
2 changes: 1 addition & 1 deletion boards/sltb001a/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk

# setup JLink for flashing
export JLINK_DEVICE := EFR32MG1PxxxF256
JLINK_DEVICE = EFR32MG1PxxxF256
export JLINK_PRE_FLASH = r

# include board common
Expand Down
2 changes: 1 addition & 1 deletion boards/slwstk6220a/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))

# setup JLink for flashing
export JLINK_DEVICE := ezr32wg330f256
JLINK_DEVICE = ezr32wg330f256
include $(RIOTMAKE)/tools/jlink.inc.mk

# setup serial terminal
Expand Down