RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #11130 from cladmi/pr/make/flashfile/jlink

Browse Source 
makefiles/tools/jlink.inc.mk: use FLASHFILE
This commit is contained in:
Francisco Acosta 2019-03-14 12:01:02 +01:00 committed by GitHub
commit 0f4e51d543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/mcuboot.mk
View File

@ -41,13 +41,11 @@ $(MCUBOOT_BIN):
.PHONY: mcuboot-flash-bootloader mcuboot-flash
mcuboot-flash-bootloader: HEXFILE = $(MCUBOOT_BIN)
mcuboot-flash-bootloader: FLASHFILE = $(MCUBOOT_BIN)
mcuboot-flash-bootloader: export FLASH_ADDR = 0x0
mcuboot-flash-bootloader: $(MCUBOOT_BIN) $(FLASHDEPS)
$(flash-recipe)
mcuboot-flash: HEXFILE = $(SIGN_BINFILE)
mcuboot-flash: FLASHFILE = $(SIGN_BINFILE)
mcuboot-flash: export FLASH_ADDR = $(MCUBOOT_SLOT0_SIZE)
mcuboot-flash: mcuboot $(FLASHDEPS) mcuboot-flash-bootloader

4
makefiles/tools/jlink.inc.mk
View File

@ -3,9 +3,9 @@ export DEBUGGER = $(RIOTTOOLS)/jlink/jlink.sh
export DEBUGSERVER = $(RIOTTOOLS)/jlink/jlink.sh
export RESET = $(RIOTTOOLS)/jlink/jlink.sh
HEXFILE = $(BINFILE)
FLASHFILE ?= $(BINFILE)
export FFLAGS ?= flash $(HEXFILE)
export FFLAGS ?= flash $(FLASHFILE)
export DEBUGGER_FLAGS ?= debug $(ELFFILE)
export DEBUGSERVER_FLAGS ?= debug-server
export RESET_FLAGS ?= reset