From 1de034819b7d1adfb276ae0ad0c1bdf5da945c7b Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Thu, 26 Sep 2019 17:17:40 +0200 Subject: [PATCH] makefiles/boot/riotboot.mk: exclude riotboot application - riotboot targets should not be needed for riotboot application so dont include it. - also fixes #12003 by not setting FLASHFILE = $(RIOTBOOT_EXTENDED_BIN) when compiling riotboot application --- bootloaders/riotboot/Makefile | 2 +- makefiles/boot/riotboot.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bootloaders/riotboot/Makefile b/bootloaders/riotboot/Makefile index 0419c85017528..c56b0ff21eefb 100644 --- a/bootloaders/riotboot/Makefile +++ b/bootloaders/riotboot/Makefile @@ -7,7 +7,7 @@ BOARD ?= samr21-xpro # Select the boards with riotboot feature FEATURES_REQUIRED += riotboot -# Provide a define to detect if building the bootloader +# Provide a define to detect in code if building the bootloader CFLAGS += -DRIOTBOOT # Disable unused modules diff --git a/makefiles/boot/riotboot.mk b/makefiles/boot/riotboot.mk index f07d049617104..ad4e66520354a 100644 --- a/makefiles/boot/riotboot.mk +++ b/makefiles/boot/riotboot.mk @@ -1,4 +1,5 @@ ifneq (,$(filter riotboot,$(FEATURES_USED))) +ifeq (,$(filter riotboot,$(APPLICATION))) .PHONY: riotboot/flash riotboot/flash-bootloader riotboot/flash-slot0 riotboot/flash-slot1 riotboot/bootloader/% @@ -155,4 +156,5 @@ riotboot: $(Q)echo "error: riotboot feature not selected! (try FEATURES_REQUIRED += riotboot)" $(Q)false +endif # (,$(filter riotboot,$(APPLICATION))) endif # (,$(filter riotboot,$(FEATURES_USED)))