Skip to content

Commit

Permalink
boards/nrf52dk: replace JLINK_FLASH_ADDR by global FLASH_ADDR variable
Browse files Browse the repository at this point in the history
  • Loading branch information
kYc0o committed Jul 17, 2017
1 parent 3b6fad4 commit ce5f40a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion boards/nrf52840dk/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export JLINK_DEVICE := nrf52
# special options when using SoftDevice
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
export JLINK_PRE_FLASH := erase\nloadfile $(BINDIR)/softdevice.hex
export JLINK_FLASH_ADDR := 0x1f000
export FLASH_ADDR := 0x1f000
export LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld
endif
include $(RIOTMAKE)/tools/jlink.inc.mk
Expand Down
2 changes: 1 addition & 1 deletion boards/nrf52dk/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export JLINK_DEVICE := nrf52
# special options when using SoftDevice
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
export JLINK_PRE_FLASH := erase\nloadfile $(BINDIR)/softdevice.hex
export JLINK_FLASH_ADDR := 0x1f000
export FLASH_ADDR := 0x1f000
export LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld
endif
include $(RIOTMAKE)/tools/jlink.inc.mk
Expand Down

0 comments on commit ce5f40a

Please sign in to comment.