RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 22:52:45 +01:00
Code Releases Activity

boards: don't export FLASH_ADDR

Browse Source 
This variable is already export in vars.inc.mk
This commit is contained in:
Alexandre Abadie 2020-03-03 16:22:30 +01:00
parent 5e85994abf
commit 8489a0af53
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

@ -19,7 +19,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 export JLINK_PRE_FLASH := loadfile $(BINDIR)/softdevice.hex
export 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
# It must be taken into account for the test input hash and # It must be taken into account for the test input hash and

2
boards/hifive1b/Makefile.include
View File

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

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

@ -21,7 +21,7 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk
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 FLASH_ADDR = 0x200000
JLINK_DEVICE = CC2538SF53 JLINK_DEVICE = CC2538SF53
JLINK_IF = JTAG JLINK_IF = JTAG
JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg

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

@ -10,7 +10,7 @@ PROGRAMMER ?= cc2538-bsl
ifeq ($(PROGRAMMER),jlink) ifeq ($(PROGRAMMER),jlink)
# setup JLink for flashing # setup JLink for flashing
JLINK_DEVICE = cc2538sf53 JLINK_DEVICE = cc2538sf53
export FLASH_ADDR := 0x200000 FLASH_ADDR = 0x200000
JLINK_IF = JTAG JLINK_IF = JTAG
export TUI := 1 export TUI := 1
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk