From d4775ccf964a01c94b20015aad5c774ca1dc18ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Wed, 19 Dec 2018 18:22:10 +0100 Subject: [PATCH] riotboot: remove compatibility for HEXFILE as file to flash It is now the case for `edbg`. Openocd support still needs special handling. --- makefiles/boot/riotboot.mk | 9 +-------- tests/riotboot/Makefile | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/makefiles/boot/riotboot.mk b/makefiles/boot/riotboot.mk index bca34b714e..ffba366144 100644 --- a/makefiles/boot/riotboot.mk +++ b/makefiles/boot/riotboot.mk @@ -97,9 +97,6 @@ $(RIOTBOOT_EXTENDED_BIN): $(RIOTBOOT_COMBINED_BIN) $(Q)truncate -s $$(($(SLOT0_OFFSET) + $(SLOT0_LEN) + $(RIOTBOOT_HDR_LEN))) $@.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 riotboot/flash-combined-slot0: ELFFILE=$(RIOTBOOT_COMBINED_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 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 -riotboot/flash-slot0: ELFFILE=$(SLOT0_RIOT_BIN) +riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot0: FLASHFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot0: $(SLOT0_RIOT_BIN) $(FLASHDEPS) $(flash-recipe) # Flashing rule for slot 1 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 riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: FLASHFILE=$(SLOT1_RIOT_BIN) diff --git a/tests/riotboot/Makefile b/tests/riotboot/Makefile index bbc57adf13..9b7fa46e76 100644 --- a/tests/riotboot/Makefile +++ b/tests/riotboot/Makefile @@ -28,5 +28,3 @@ include $(RIOTBASE)/Makefile.include # This is currently hacky as the flasher are not using 'FLASHFILE' # openocd ELFFILE = $(FLASHFILE) -# edbg -HEXFILE = $(FLASHFILE)