Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boards: remove duplicate include 'RIOTCPU/cpu/Makefile.features' #12335

Merged

Conversation

cladmi
Copy link
Contributor

@cladmi cladmi commented Sep 30, 2019

Contribution description

When 'CPU' is defined, the CPU Makefile.features is included by the
build system in the main Makefile.features.
No need to do it manually anymore.

Testing procedure

Compare the output of info-build for all affected boards. Some duplicate includes are now removed:

for board in bluepill blackpill bluepill-128kib blackpill-128kib p-l496g-cell02 samr34-xpro stm32f723e-disco; do BOARD=${board} make --no-print-directory -C examples/hello-world/ info-build | sed "s|${PWD}/||"g ; done

The 3 removed lines in included makefiles in MAKEFILE_LIST are the 3 lines that are already parsed before:

Difference in info-build between master and this PR
--- info-build-master   2019-09-30 12:40:59.110072205 +0200
+++ info-build-pr       2019-09-30 12:40:24.357554378 +0200
@@ -170,9 +170,6 @@
        cpu/stm32f1/Makefile.features  
        cpu/stm32_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/stm32f1/Makefile.features  
-       cpu/stm32_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/bluepill/Makefile.include  
@@ -387,9 +384,6 @@
        cpu/stm32f1/Makefile.features  
        cpu/stm32_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/stm32f1/Makefile.features  
-       cpu/stm32_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/blackpill/Makefile.include  
@@ -604,9 +598,6 @@
        cpu/stm32f1/Makefile.features  
        cpu/stm32_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/stm32f1/Makefile.features  
-       cpu/stm32_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/bluepill-128kib/Makefile.include  
@@ -821,9 +812,6 @@
        cpu/stm32f1/Makefile.features  
        cpu/stm32_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/stm32f1/Makefile.features  
-       cpu/stm32_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/blackpill-128kib/Makefile.include  
@@ -1039,9 +1027,6 @@
        cpu/stm32l4/Makefile.features  
        cpu/stm32_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/stm32l4/Makefile.features  
-       cpu/stm32_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/p-l496g-cell02/Makefile.include  
@@ -1251,9 +1236,6 @@
        cpu/saml21/Makefile.features  
        cpu/sam0_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/saml21/Makefile.features  
-       cpu/sam0_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/samr34-xpro/Makefile.include  
@@ -1466,9 +1448,6 @@
        cpu/stm32f7/Makefile.features  
        cpu/stm32_common/Makefile.features  
        cpu/cortexm_common/Makefile.features  
-       cpu/stm32f7/Makefile.features  
-       cpu/stm32_common/Makefile.features  
-       cpu/cortexm_common/Makefile.features  
        makefiles/pseudomodules.inc.mk  
        makefiles/defaultmodules.inc.mk  
        boards/stm32f723e-disco/Makefile.include  

Issues/PRs references

Part of Tracking: move CPU/CPU_MODEL to Makefile.features #11477

When 'CPU' is defined, the CPU Makefile.features is included by the
build system in the main Makefile.features.
No need to do it manually anymore.
@benpicco benpicco added Area: boards Area: Board ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels Sep 30, 2019
Copy link
Contributor

@benpicco benpicco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makefiles are included automatically, no need for manual includes.

@benpicco benpicco merged commit 806b0c4 into RIOT-OS:master Sep 30, 2019
@cladmi
Copy link
Contributor Author

cladmi commented Oct 1, 2019

Thank you for the review, I will rebase the PRs that depended on it.

@cladmi cladmi deleted the pr/boards/remove_duplicate_include_riotcpu branch October 1, 2019 09:35
@kb2ma kb2ma added this to the Release 2019.10 milestone Oct 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: boards Area: Board ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants