Skip to content

Commit

Permalink
boards: don't export JLINK_PRE_FLASH
Browse files Browse the repository at this point in the history
  • Loading branch information
aabadie committed Mar 6, 2020
1 parent d05743d commit 7cec045
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion boards/common/nrf52/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ifeq (jlink,$(PROGRAMMER))

# special options when using SoftDevice
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
export JLINK_PRE_FLASH := loadfile $(BINDIR)/softdevice.hex
JLINK_PRE_FLASH = loadfile $(BINDIR)/softdevice.hex
FLASH_ADDR = 0x1f000
LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld
# murdock: softdevice.hex file is used for flashing
Expand Down
2 changes: 1 addition & 1 deletion boards/slstk3401a/Makefile.include
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_PRE_FLASH = r
JLINK_PRE_FLASH = r

# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include
2 changes: 1 addition & 1 deletion boards/slstk3402a/Makefile.include
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_PRE_FLASH = r
JLINK_PRE_FLASH = r

# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include
2 changes: 1 addition & 1 deletion boards/sltb001a/Makefile.include
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
JLINK_DEVICE = EFR32MG1PxxxF256
export JLINK_PRE_FLASH = r
JLINK_PRE_FLASH = r

# include board common
include $(RIOTBOARD)/common/silabs/Makefile.include

0 comments on commit 7cec045

Please sign in to comment.