From 8c70ad4a310abe52f51d28e2c502bfbf2b344a34 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Mon, 18 Nov 2019 14:24:56 +0100 Subject: [PATCH 1/2] Makefile.dep: make `stdio_uart` a feature required by `ethos` --- Makefile.dep | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 3abf863f134a..7e3ede4fe510 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -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 endif endif @@ -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))) @@ -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))) From bd706cd128fcac4ea3740e6136bba62bb5b6280c Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Mon, 18 Nov 2019 14:29:12 +0100 Subject: [PATCH 2/2] examples: tests: remove ethos-related `BOARD_BLACKLIST`s --- examples/gnrc_border_router/Makefile | 3 --- tests/gnrc_ipv6_ext/Makefile | 3 --- tests/gnrc_ipv6_ext_frag/Makefile | 3 --- tests/gnrc_rpl_srh/Makefile | 3 --- tests/gnrc_sock_dns/Makefile | 3 --- tests/gnrc_tcp/Makefile | 3 --- 6 files changed, 18 deletions(-) diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile index 28b1f0fa946c..0aeb2c7565e8 100644 --- a/examples/gnrc_border_router/Makefile +++ b/examples/gnrc_border_router/Makefile @@ -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))) diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile index d51860e533f2..8ed1ffca6fc1 100644 --- a/tests/gnrc_ipv6_ext/Makefile +++ b/tests/gnrc_ipv6_ext/Makefile @@ -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 diff --git a/tests/gnrc_ipv6_ext_frag/Makefile b/tests/gnrc_ipv6_ext_frag/Makefile index 80884344db43..560c56f37db2 100644 --- a/tests/gnrc_ipv6_ext_frag/Makefile +++ b/tests/gnrc_ipv6_ext_frag/Makefile @@ -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 diff --git a/tests/gnrc_rpl_srh/Makefile b/tests/gnrc_rpl_srh/Makefile index 79d4cd74b9f7..2000e8394206 100644 --- a/tests/gnrc_rpl_srh/Makefile +++ b/tests/gnrc_rpl_srh/Makefile @@ -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 diff --git a/tests/gnrc_sock_dns/Makefile b/tests/gnrc_sock_dns/Makefile index 5837b7bec588..1049d36c6d3c 100644 --- a/tests/gnrc_sock_dns/Makefile +++ b/tests/gnrc_sock_dns/Makefile @@ -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 diff --git a/tests/gnrc_tcp/Makefile b/tests/gnrc_tcp/Makefile index 88abd3bd5eb8..ee0ecf71fb00 100644 --- a/tests/gnrc_tcp/Makefile +++ b/tests/gnrc_tcp/Makefile @@ -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