From 15ab36409fbf5cbd4f2ee9f65c6bd05f55445510 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Tue, 24 Mar 2020 14:33:09 +0100 Subject: [PATCH] Makefile.dep: add auto_init_usbus as usbus DEFAULT_MODULE --- Makefile.dep | 1 + boards/common/samd21-arduino-bootloader/Makefile.dep | 3 --- tests/usbus_cdc_acm_stdio/Makefile | 1 - tests/usbus_cdc_ecm/Makefile | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 6c07ef3a22..dea76221bc 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -901,6 +901,7 @@ ifneq (,$(filter tlsf-malloc,$(USEMODULE))) endif ifneq (,$(filter usbus,$(USEMODULE))) + DEFAULT_MODULE += auto_init_usbus FEATURES_REQUIRED += periph_usbdev USEMODULE += core_thread_flags USEMODULE += event diff --git a/boards/common/samd21-arduino-bootloader/Makefile.dep b/boards/common/samd21-arduino-bootloader/Makefile.dep index 13b7258073..4edaa81458 100644 --- a/boards/common/samd21-arduino-bootloader/Makefile.dep +++ b/boards/common/samd21-arduino-bootloader/Makefile.dep @@ -3,9 +3,6 @@ # handled by the build system DEFAULT_MODULE += stdio_cdc_acm -# Default auto-initialization of usbus for stdio other USB -USEMODULE += auto_init_usbus - # This boards requires support for Arduino bootloader. USEMODULE += usb_board_reset USEMODULE += boards_common_samd21-arduino-bootloader diff --git a/tests/usbus_cdc_acm_stdio/Makefile b/tests/usbus_cdc_acm_stdio/Makefile index 4d07162137..634bea9503 100644 --- a/tests/usbus_cdc_acm_stdio/Makefile +++ b/tests/usbus_cdc_acm_stdio/Makefile @@ -1,7 +1,6 @@ BOARD ?= samr21-xpro include ../Makefile.tests_common -USEMODULE += auto_init_usbus USEMODULE += stdio_cdc_acm USEMODULE += shell USEMODULE += shell_commands diff --git a/tests/usbus_cdc_ecm/Makefile b/tests/usbus_cdc_ecm/Makefile index 8509d6fb3d..cde5ee63c8 100644 --- a/tests/usbus_cdc_ecm/Makefile +++ b/tests/usbus_cdc_ecm/Makefile @@ -2,7 +2,6 @@ BOARD ?= samr21-xpro include ../Makefile.tests_common USEMODULE += auto_init_gnrc_netif -USEMODULE += auto_init_usbus USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_icmpv6_echo USEMODULE += usbus_cdc_ecm