makefiles/kconfig: add board & CPU config variables#17376
Merged
MrKevinWeiss merged 2 commits intoRIOT-OS:masterfrom Dec 13, 2021
Merged
Conversation
efea031 to
d128c0d
Compare
fjmolinas
approved these changes
Dec 10, 2021
Contributor
fjmolinas
left a comment
There was a problem hiding this comment.
ACK, murdock should check the dependencies.
Contributor
|
Looks like there are still some issues, I will try to push a solution as @leandrolanzieri is a bit unavailable. |
Contributor
|
I changes the priority of |
Contributor
|
Things seem to be doing OK now. May I squash (or @leandrolanzieri ). |
Contributor
|
Please squash, ACK stands |
This introduces KCONFIG_BOARD_CONFIG and KCONFIG_CPU_CONFIG variable for boards and CPUs (including common directories) to add default configuration files to be merged. The current approach, as it uses Makefile.features, would include boards first, not allowing them to override CPU configurations.
f40de78 to
c8533e6
Compare
Contributor
|
Done! now we wait :) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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
This introduces
KCONFIG_BOARD_CONFIGandKCONFIG_CPU_CONFIGvariable for boards and CPUs (including common directories) to add default configuration files to be merged. The current approach, as it usesMakefile.features, would include boards first, not allowing them to override CPU configurations.Documentation on this is added as well.
Testing procedure
stm32f769i-disco, which has configuration files from different sources (board, stm32, cortexm_common), now the order is the correct: 1st the arch, 2nd the cpu, 3rd the board. This can be seen by printingMERGE_SOURCESfrommakefiles/kconfig.mkand building withTEST_KCONFIG=1.Issues/PRs references
Found in #17349