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

boards: don't export JLINK_PRE_FLASH

Browse Source
This commit is contained in:
Alexandre Abadie 2020-03-03 16:43:45 +01:00
parent 6560a1f567
commit c49ad27499
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ ifeq (jlink,$(PROGRAMMER))
# special options when using SoftDevice # special options when using SoftDevice
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG))) ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
export JLINK_PRE_FLASH := loadfile $(BINDIR)/softdevice.hex JLINK_PRE_FLASH = loadfile $(BINDIR)/softdevice.hex
FLASH_ADDR = 0x1f000 FLASH_ADDR = 0x1f000
LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld
# murdock: softdevice.hex file is used for flashing # murdock: softdevice.hex file is used for flashing

2
boards/slstk3401a/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_PRE_FLASH = r JLINK_PRE_FLASH = r
# include board common # include board common
include $(RIOTBOARD)/common/silabs/Makefile.include include $(RIOTBOARD)/common/silabs/Makefile.include

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

2
boards/sltb001a/Makefile.include
View File

@ -7,7 +7,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# setup JLink for flashing # setup JLink for flashing
JLINK_DEVICE = EFR32MG1PxxxF256 JLINK_DEVICE = EFR32MG1PxxxF256
export JLINK_PRE_FLASH = r JLINK_PRE_FLASH = r
# include board common # include board common
include $(RIOTBOARD)/common/silabs/Makefile.include include $(RIOTBOARD)/common/silabs/Makefile.include