[riot-notifications] [RIOT-OS/RIOT] riotboot: use riotboot if feature is used (#11690)

Kaspar Schleiser notifications at github.com
Thu Jun 13 12:25:54 CEST 2019


### Contribution description

Previously, even an application that had "FEATURES_REQUIRED += riotboot"
set would still flash the non-riotboot binary on "make flash".
This is usually not what the user wants.

This commit set's the FLASHFILE variable to the combined "riotboot
bootloader + slot0 + empty slot1" binary, if the riotboot feature is used.
This has the effect that "make all", "make flash" and "make flash-only" will compile and/or flash a working riotboot setup.

This was previously done for tests/riotboot within that application's Makefile. This PR moves the definition into ```makefiles/boot/riotboot.inc.mk```, guarded by whether the riotboot feature is used.

### Testing procedure

- confirm that non-riotboot flashing still works (e.g., by flashing hello-world)
- run "make flash" in tests/riotboot. It should flash the combined binary

### Issues/PRs references


You can view, comment on, or merge this pull request online at:

  https://github.com/RIOT-OS/RIOT/pull/11690

-- Commit Summary --

  * riotboot: use riotboot if feature is used

-- File Changes --

    M makefiles/boot/riotboot.mk (7)
    M tests/riotboot/Makefile (4)

-- Patch Links --

https://github.com/RIOT-OS/RIOT/pull/11690.patch
https://github.com/RIOT-OS/RIOT/pull/11690.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/RIOT-OS/RIOT/pull/11690
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.riot-os.org/pipermail/notifications/attachments/20190613/cafb062f/attachment.html>


More information about the notifications mailing list