From 748bc6deeec7d2dc92e65650d865d34677c798f2 Mon Sep 17 00:00:00 2001 From: Juan Carrano Date: Tue, 5 Mar 2019 14:39:57 +0100 Subject: [PATCH] makefiles/riotboot: use canned recipe for flashing. A canned recipe had previously been defined to perform the flashing procedure. The canned recipe is preferred to calling $(FLASHER) $(FFLAGS) as there might be additional steps involved in flashing (this is handled by preflash currently but with the canned recipe we will be able to fix it.) --- makefiles/boot/riotboot.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefiles/boot/riotboot.mk b/makefiles/boot/riotboot.mk index 7db04d4b52..0abe2c1d75 100644 --- a/makefiles/boot/riotboot.mk +++ b/makefiles/boot/riotboot.mk @@ -120,11 +120,11 @@ riotboot/flash-extended-slot0: ELFFILE=$(RIOTBOOT_EXTENDED_BIN) riotboot/flash-combined-slot0: FLASHFILE=$(RIOTBOOT_COMBINED_BIN) riotboot/flash-combined-slot0: $(RIOTBOOT_COMBINED_BIN) $(FLASHDEPS) - $(FLASHER) $(FFLAGS) + $(flash-recipe) riotboot/flash-extended-slot0: FLASHFILE=$(RIOTBOOT_EXTENDED_BIN) riotboot/flash-extended-slot0: $(RIOTBOOT_EXTENDED_BIN) $(FLASHDEPS) - $(FLASHER) $(FFLAGS) + $(flash-recipe) # Flashing rule for slot 0 riotboot/flash-slot0: export IMAGE_OFFSET=$(SLOT0_OFFSET) @@ -134,7 +134,7 @@ riotboot/flash-slot0: HEXFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot0: ELFFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot0: FLASHFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot0: $(SLOT0_RIOT_BIN) $(FLASHDEPS) - $(FLASHER) $(FFLAGS) + $(flash-recipe) # Flashing rule for slot 1 riotboot/flash-slot1: export IMAGE_OFFSET=$(SLOT1_OFFSET) @@ -144,7 +144,7 @@ riotboot/flash-slot1: HEXFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: FLASHFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: $(SLOT1_RIOT_BIN) $(FLASHDEPS) - $(FLASHER) $(FFLAGS) + $(flash-recipe) # Targets to generate only slots binary riotboot/slot0: $(SLOT0_RIOT_BIN)