riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.dep: disable stdio_rtt with any other STDIO than stdio_rtt

Browse Source 
f5cbe00118 disables `stdio_rtt` when `stdio_uart` is used. However,
if a board has `periph_usbdev` in `FEATURES_PROVIDED` and
`stdio_cdc_acm` is used by the application, linking fails, as now both
`stdio_rtt` and `stdio_cdc_acm` implement the STDIO functions.

This fix excludes `stdio_rtt` if any STDIO but `stdio_rtt` is provided.
If no STDIO is provided the fall-back is used as before.
This commit is contained in:
Martine S. Lenders 2020-01-15 14:15:29 +01:00 committed by Francisco Molina
parent 78b5c1ee5c
commit a3bf3ef95b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.dep
View File

@ -468,8 +468,10 @@ endif
ifneq (,$(filter stdio_uart,$(USEMODULE))) ifneq (,$(filter stdio_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart FEATURES_REQUIRED += periph_uart
endif
# stdio_rtt cannot be used when stdio_uart is loaded ifneq (,$(filter stdio_cdc_acm stdio_null stdio_uart,$(USEMODULE)))
# stdio_rtt cannot be used when another STDIO is loaded
DISABLE_MODULE += stdio_rtt DISABLE_MODULE += stdio_rtt
endif endif