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

riotboot: remove compatibility for HEXFILE as file to flash

Browse Source 
It is now the case for `edbg`.
Openocd support still needs special handling.
This commit is contained in:
Gaëtan Harter 2018-12-19 18:22:10 +01:00
parent 72bc21c0de
commit d4775ccf96
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefiles/boot/riotboot.mk
View File

@ -97,9 +97,6 @@ $(RIOTBOOT_EXTENDED_BIN): $(RIOTBOOT_COMBINED_BIN)
$(Q)truncate -s $$(($(SLOT0_OFFSET) + $(SLOT0_LEN) + $(RIOTBOOT_HDR_LEN))) $@.tmp $(Q)truncate -s $$(($(SLOT0_OFFSET) + $(SLOT0_LEN) + $(RIOTBOOT_HDR_LEN))) $@.tmp
$(Q)mv $@.tmp $@ $(Q)mv $@.tmp $@
# Flashing rule for edbg to flash combined/extended binaries
riotboot/flash-combined-slot0: HEXFILE=$(RIOTBOOT_COMBINED_BIN)
riotboot/flash-extended-slot0: HEXFILE=$(RIOTBOOT_EXTENDED_BIN)
# Flashing rule for openocd to flash combined/extended binaries # Flashing rule for openocd to flash combined/extended binaries
riotboot/flash-combined-slot0: ELFFILE=$(RIOTBOOT_COMBINED_BIN) riotboot/flash-combined-slot0: ELFFILE=$(RIOTBOOT_COMBINED_BIN)
riotboot/flash-extended-slot0: ELFFILE=$(RIOTBOOT_EXTENDED_BIN) riotboot/flash-extended-slot0: ELFFILE=$(RIOTBOOT_EXTENDED_BIN)
@ -114,18 +111,14 @@ riotboot/flash-extended-slot0: $(RIOTBOOT_EXTENDED_BIN) $(FLASHDEPS)
# Flashing rule for slot 0 # Flashing rule for slot 0
riotboot/flash-slot0: export IMAGE_OFFSET=$(SLOT0_OFFSET) riotboot/flash-slot0: export IMAGE_OFFSET=$(SLOT0_OFFSET)
# Flashing rule for edbg to flash only slot 0
riotboot/flash-slot0: HEXFILE=$(SLOT0_RIOT_BIN)
# openocd # openocd
riotboot/flash-slot0: ELFFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN)
riotboot/flash-slot0: FLASHFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot0: FLASHFILE=$(SLOT0_RIOT_BIN)
riotboot/flash-slot0: $(SLOT0_RIOT_BIN) $(FLASHDEPS) riotboot/flash-slot0: $(SLOT0_RIOT_BIN) $(FLASHDEPS)
$(flash-recipe) $(flash-recipe)
# Flashing rule for slot 1 # Flashing rule for slot 1
riotboot/flash-slot1: export IMAGE_OFFSET=$(SLOT1_OFFSET) riotboot/flash-slot1: export IMAGE_OFFSET=$(SLOT1_OFFSET)
# Flashing rule for edbg to flash only slot 1
riotboot/flash-slot1: HEXFILE=$(SLOT1_RIOT_BIN)
# openocd # openocd
riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN)
riotboot/flash-slot1: FLASHFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: FLASHFILE=$(SLOT1_RIOT_BIN)

2
tests/riotboot/Makefile
View File

@ -28,5 +28,3 @@ include $(RIOTBASE)/Makefile.include
# This is currently hacky as the flasher are not using 'FLASHFILE' # This is currently hacky as the flasher are not using 'FLASHFILE'
# openocd # openocd
ELFFILE = $(FLASHFILE) ELFFILE = $(FLASHFILE)
# edbg
HEXFILE = $(FLASHFILE)