RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00
Code Releases Activity

*/Makefile.dep: remove usage of DEFAULT_MODULE += stdio%

Browse Source
This commit is contained in:
Francisco Molina 2020-04-02 09:21:58 +02:00
parent cd0b765346
commit 0e5205c4a5
No known key found for this signature in database
GPG Key ID: 3E94EAC3DBDEEDA8
6 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/feather-nrf52840/Makefile.dep
View File

@ -1,7 +1,7 @@
# Provide stdio over USB by default
# This is a temporary solution until management of stdio is correctly
# handled by the build system
DEFAULT_MODULE += stdio_cdc_acm
# Use stdio_cdc_acm unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
USEMODULE += stdio_cdc_acm
endif
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio

6
boards/hamilton/Makefile.dep
View File

@ -13,5 +13,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
#USEMODULE += apds9007
endif
# Use Segger's RTT by default for stdio on this board
DEFAULT_MODULE += stdio_rtt
# Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
USEMODULE += stdio_rtt
endif

5
boards/pinetime/Makefile.dep
View File

@ -1,4 +1,7 @@
DEFAULT_MODULE += stdio_rtt
# Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
USEMODULE += stdio_rtt
endif
ifneq (,$(filter mtd,$(USEMODULE)))
USEMODULE += mtd_spi_nor

6
boards/ruuvitag/Makefile.dep
View File

@ -4,8 +4,10 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lis2dh12_spi
endif
# Use Segger's RTT by default for stdio on this board
DEFAULT_MODULE += stdio_rtt
# Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
USEMODULE += stdio_rtt
endif
USEMODULE += boards_common_nrf52xxdk

6
boards/thingy52/Makefile.dep
View File

@ -4,7 +4,9 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lps22hb
endif
# Use Segger's RTT by default for stdio on this board
DEFAULT_MODULE += stdio_rtt
# Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
USEMODULE += stdio_rtt
endif
include $(RIOTBOARD)/common/nrf52/Makefile.dep

14
makefiles/stdio.inc.mk
View File

@ -7,20 +7,6 @@ STDIO_MODULES = \
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