Skip to content

Commit

Permalink
makefiles/boot/riotboot.mk: exclude if RIOTBOOT_BUILD is set
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 #12003 by not setting FLASHFILE = $(RIOTBOOT_EXTENDED_BIN)
  when compiling riotboot application
  • Loading branch information
fjmolinas committed Jan 10, 2020
1 parent 842b7e3 commit aa5c617
Showing 1 changed file with 2 additions and 0 deletions.
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)))
ifneq (1,$(RIOTBOOT_BUILD))

.PHONY: riotboot/flash riotboot/flash-bootloader riotboot/flash-slot0 riotboot/flash-slot1 riotboot/bootloader/%

Expand Down Expand Up @@ -154,4 +155,5 @@ riotboot:
$(Q)echo "error: riotboot feature not selected! (try FEATURES_REQUIRED += riotboot)"
$(Q)false

endif # (1,$(RIOTBOOT_BUILD))
endif # (,$(filter riotboot,$(FEATURES_USED)))

0 comments on commit aa5c617

Please sign in to comment.