Tracking: move CPU/CPU_MODEL to Makefile.features#11477
Closed
cladmi wants to merge 1 commit intoRIOT-OS:masterfrom
Closed
Tracking: move CPU/CPU_MODEL to Makefile.features#11477cladmi wants to merge 1 commit intoRIOT-OS:masterfrom
cladmi wants to merge 1 commit intoRIOT-OS:masterfrom
Conversation
This was referenced May 2, 2019
19 tasks
a37f063 to
399e02a
Compare
399e02a to
f2d9013
Compare
This was referenced Jun 11, 2019
f2d9013 to
860dcfa
Compare
5746968 to
2bd0746
Compare
2bd0746 to
06b57d0
Compare
8d3c34e to
789257b
Compare
e94b04c to
ad7221a
Compare
169bcf6 to
58317f4
Compare
This was referenced Sep 30, 2019
0248785 to
829261c
Compare
829261c to
9de1545
Compare
This was referenced Sep 30, 2019
08d2fae to
cf2bee8
Compare
cf2bee8 to
4d2884f
Compare
Member
|
Reset milestone to 2019.10. We anticipate that the imminent merge of #12410 allows this PR also to be merged. |
…ures CPU must now be defined by `$(RIOTBOARD)/$(BOARD)/Makefile.features` or one of its common included Makefile.features file. The cpu `Makefile.dep` file can now automatically be included when it exists.
4d2884f to
eff80f7
Compare
Contributor
Author
|
Migration is now finished! Thank you for everybody who helped. Last commit remaining in this branch is the one forbidding the old behavior. Currently checking that CPU is defined is enforced in RIOT by the |
Contributor
Author
|
The PR enforcing the new behavior is in #12417 |
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
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 pull request is a tracking pull request for moving the definition of
CPUandCPU_MODELto the board Makefile.features.Moving these definitions is required to be parse
Makefile.depbefore `Makefile.include.It is part of #9913
This pull request is going to be split
Makefile.features: prerequisites for moving CPU/CPU_MODEL to boards/Makefile.features Makefile.features: prerequisites for moving CPU/CPU_MODEL to boards/Makefile.features #11478
Required cleanups
slwstk6000bBOARD_MODULEandMODULE_CPU, andCPU_MODEL.Move the
CPU_MODELincludes forMakefile.nrf52832.featuresinnrf52/Makefile.features(related to ble/softdevice: add ble_nordic_softdevice feature #11769)Questions:
CPU_MODEL
Currently the only place left where
CPU_MODELis not defined inboard/.../Makefile.featuresismakefiles/arch/cortexm.inc.mk.Would it make sense to define with this value by default globally in RIOT if not defined ? I could define it now in
Makefile.features.It would remove the need to define them for cpu
fe310,esp*,lpc1768(the only one using the value ofcortexm.inc.mk.Another solution is to define it in
cpu/cortexm_common/Makefile.featuresbut it would be the only one defined incpu.Testing procedure
First compiling everything in the CI should still work. The number of jobs should stay the same.
I will also provide a way to verify that the
FEATURES_PROVIDEDdo not change.I am currently running https://gist.github.com/cladmi/893e63740f935cbfe4087db19a8c17af
For
tests/riotboot_hdr, the output always contains this even on master for some boards.Issues/PRs references
Tracking issue #9913 on dependency handling order.