Skip to content

Commit

Permalink
makefiles/boot/riotboot.mk: exclude riotboot application
Browse files Browse the repository at this point in the history
- riotboot targets should not be needed for riotboot application
  so dont include it.
- also fixes RIOT-OS#12003 by not setting FLASHFILE = $(RIOTBOOT_EXTENDED_BIN)
  when compiling riotboot application
  • Loading branch information
fjmolinas committed Sep 26, 2019
1 parent e942f86 commit 1de0348
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bootloaders/riotboot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions makefiles/boot/riotboot.mk
Original file line number Diff line number Diff line change
@@ -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/%

Expand Down Expand Up @@ -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)))

0 comments on commit 1de0348

Please sign in to comment.