-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Makefile.dep: disable stdio_% modules before they are included #13650
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| STDIO_MODULES = \ | ||
| slipdev_stdio \ | ||
| stdio_cdc_acm \ | ||
| stdio_ethos \ | ||
| stdio_null \ | ||
| stdio_rtt \ | ||
| stdio_uart \ | ||
| # | ||
|
|
||
| # Since USEMODULE and DEFAULT_MODULEs are recursively expanded we need to | ||
| # disable DEFAULT_MODULEs before any of there dependencies are evaluated, | ||
| # otherwise the disabled MODULE will be in USEMODULE (triggering) its | ||
| # dependencies, and then removed but leaving its dependencies | ||
| ifneq (,$(filter $(filter-out stdio_rtt,$(STDIO_MODULES)),$(USEMODULE))) | ||
| # stdio_rtt cannot be used when another STDIO is loaded | ||
| DISABLE_MODULE += stdio_rtt | ||
| endif | ||
|
|
||
| ifneq (,$(filter $(filter-out stdio_cdc_acm,$(STDIO_MODULES)),$(USEMODULE))) | ||
| # stdio_cdc_acm cannot be used when another STDIO is loaded | ||
| DISABLE_MODULE += stdio_cdc_acm | ||
| endif | ||
|
|
||
| ifneq (,$(filter newlib,$(USEMODULE))) | ||
| ifeq (,$(filter $(STDIO_MODULES),$(USEMODULE))) | ||
| USEMODULE += stdio_uart | ||
| endif | ||
| endif | ||
|
|
||
| ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) | ||
| USEMODULE += usbus_cdc_acm | ||
| USEMODULE += isrpipe | ||
| endif | ||
|
|
||
| ifneq (,$(filter stdio_rtt,$(USEMODULE))) | ||
| USEMODULE += xtimer | ||
| endif | ||
|
|
||
| ifneq (,$(filter stdio_ethos,$(USEMODULE))) | ||
| USEMODULE += ethos | ||
| USEMODULE += stdin | ||
| USEMODULE += stdio_uart | ||
| endif | ||
|
|
||
| ifneq (,$(filter stdin,$(USEMODULE))) | ||
| ifneq (,$(filter stdio_uart,$(USEMODULE))) | ||
| USEMODULE += stdio_uart_rx | ||
| endif | ||
| endif | ||
|
|
||
| ifneq (,$(filter stdio_uart_rx,$(USEMODULE))) | ||
| USEMODULE += isrpipe | ||
| USEMODULE += stdio_uart | ||
| endif | ||
|
|
||
| ifneq (,$(filter stdio_uart,$(USEMODULE))) | ||
| FEATURES_REQUIRED += periph_uart | ||
| endif | ||
|
|
||
| ifeq (,$(filter stdio_cdc_acm,$(USEMODULE))) | ||
| # The arduino bootloader feature cannot be used if the stdio_cdc_acm module | ||
| # is not used | ||
| FEATURES_BLACKLIST += bootloader_arduino | ||
| endif | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adapted from
Makefile.dep, I know, but does this dependency even make sense? Why enforce a STDIO whennewlibis there? AFAIKnewlibshould just work fine without STDIO, or am I mistaken?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might just be a way of saying if
newlibis included then defaultstdioisstdio_uart.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yea, but basically this is why
stdio_nullis necessary, right? Why does there need to be astdioat all?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't but most users expect to see something if they do
make termso it makes sense to usually include it.Maybe more can be done towards cleaning this up by actually using
DEFAULT_MODULEhere, but I would rather leave it for later.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeahyeah, this was just a thought, not actually requesting a solution here.