Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

makefiles/tools/jlink.inc.mk: use FLASHFILE #11130

Merged
merged 2 commits into from
Mar 14, 2019
Merged

makefiles/tools/jlink.inc.mk: use FLASHFILE #11130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034e4ff
makefiles/jlink.inc.mk: use FLASHFILE
cladmi Dec 19, 2018
4c860f3
makefiles/mcuboot: remove compatibility for HEXFILE to flash
cladmi Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions makefiles/mcuboot.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,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
Expand Down
4 changes: 2 additions & 2 deletions makefiles/tools/jlink.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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