sys/riotboot: extend Makefile.include include to riotboot feature #11203
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
This still does not restore the previous behavior. Doing |
|
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. If you want me to ignore this issue, please mark it with the "State: don't stale" label. Thank you for your contributions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution description
#11181 broke riotboot compiles that don't use any of its modules (See this comment).
The reason was a move of some riotboot variables (SLOTx_OFFSET) into the module's Makefile.include, as it was needed there. Defining it in makefiles/boot/riotboot.inc.mk was too late.
riotboot's Makefile.include was only included based on whether any riotboot module was compiled in.
This PR extends that to also include the file if the riotboot feature is used.
Testing procedure
Try
FEATURES_REQUIRED+=riotboot BOARD=samr21-xpro make -C examples/hello-world/ riotboot/flashon master. It fails.Try with this PR, it should succeed.
Issues/PRs references
#11181