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.

Sign up for GitHub

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

Makefile.dep: make stdio_uart a feature required by ethos #12739

Closed
wants to merge 2 commits into from
Closed

Makefile.dep: make stdio_uart a feature required by ethos #12739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c70ad4
Makefile.dep: make `stdio_uart` a feature required by `ethos`
miri64 Nov 18, 2019
bd706cd
examples: tests: remove ethos-related `BOARD_BLACKLIST`s
miri64 Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ ifneq (,$(filter newlib,$(USEMODULE)))
USEMODULE += newlib_syscalls_default
endif
ifeq (,$(filter stdio_rtt stdio_cdc_acm,$(USEMODULE)))
USEMODULE += stdio_uart
FEATURES_PROVIDED += stdio_uart
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is forbidden.

Copy link
Member Author

Choose a reason for hiding this comment

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

Where and why?

Copy link
Contributor

@aabadie aabadie Nov 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Features should only be provided in Makefile.features files. Makefile.dep files are here to do the resolution of dependencies given the provided features. If we start mixing the concepts we will end up in more mess.

This PR doesn't work with make info-boards-supported, so Murdock will fail in any case:

make -C tests/gnrc_ipv6_ext_frag info-boards-supported --no-print-directory | tr " " "\n" | grep thingy52
thingy52

Normally the result should be empty if the board is excluded.

endif
endif

Expand Down Expand Up @@ -432,7 +432,7 @@ endif
ifneq (,$(filter stdio_ethos,$(USEMODULE)))
USEMODULE += ethos
USEMODULE += stdin
USEMODULE += stdio_uart
FEATURES_REQUIRED += stdio_uart
endif

ifneq (,$(filter stdin,$(USEMODULE)))
Expand All @@ -443,7 +443,7 @@ endif

ifneq (,$(filter stdio_uart_rx,$(USEMODULE)))
USEMODULE += isrpipe
USEMODULE += stdio_uart
FEATURES_PROVIDED += stdio_uart
endif

ifneq (,$(filter stdio_uart,$(USEMODULE)))
Expand Down
3 changes: 0 additions & 3 deletions examples/gnrc_border_router/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ BOARD ?= samr21-xpro
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..

# The following boards do not have an available UART
BOARD_BLACKLIST += pic32-wifire pic32-clicker ruuvitag thingy52

# use ethos (ethernet over serial) for network communication and stdio over
# UART, but not on native, as native has a tap interface towards the host.
ifeq (,$(filter native,$(BOARD)))
Expand Down
3 changes: 0 additions & 3 deletions tests/gnrc_ipv6_ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ DEVELHELP := 1
# name of your application
include ../Makefile.tests_common

# chronos, hamilton and ruuvitag boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag

export TAP ?= tap0

# use Ethernet as link-layer protocol
Expand Down
3 changes: 0 additions & 3 deletions tests/gnrc_ipv6_ext_frag/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ DEVELHELP := 1
# name of your application
include ../Makefile.tests_common

# chronos, hamilton, ruuvitag, and thingy52 boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag thingy52

export TAP ?= tap0

CFLAGS += -DOUTPUT=TEXT
Expand Down
3 changes: 0 additions & 3 deletions tests/gnrc_rpl_srh/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ DEVELHELP := 1
# name of your application
include ../Makefile.tests_common

# chronos, hamilton and ruuvitag boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag

export TAP ?= tap0

CFLAGS += -DOUTPUT=TEXT
Expand Down
3 changes: 0 additions & 3 deletions tests/gnrc_sock_dns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ include ../Makefile.tests_common

RIOTBASE ?= $(CURDIR)/../..

# chronos, hamilton and ruuvitag boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag

export TAP ?= tap0

USEMODULE += sock_dns
Expand Down
3 changes: 0 additions & 3 deletions tests/gnrc_tcp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ TAP ?= tap0
MSL_US ?= 1000000
TIMEOUT_US ?= 3000000

# unsupported by ethos: chronos, hamilton, ruuvitag
BOARD_BLACKLIST := chronos hamilton ruuvitag thingy52

# This test depends on tap device setup (only allowed by root)
# Suppress test execution to avoid CI errors
TEST_ON_CI_BLACKLIST += all
Expand Down