From 0b1b7e8408f6dcd5921ec73f83ddfa2b96eb2deb Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Wed, 7 Dec 2022 13:56:24 +0100 Subject: [PATCH] boards/arduino-zero: move tinusb_device feature The `tinyusb_device` feature introduced with PR #18689 has to be moved from `common/arduino-zero` definition to the `arduino-zero` definition because the common `arduino-zero` features are also used by `wemos-zero` which uses `highlevel_stdio` feature via the `stdio_cdc_acm` module. --- boards/arduino-zero/Kconfig | 1 + boards/arduino-zero/Makefile.features | 2 ++ boards/common/arduino-zero/Kconfig | 1 - boards/common/arduino-zero/Makefile.features | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/boards/arduino-zero/Kconfig b/boards/arduino-zero/Kconfig index bb1932fa02..c110ca3bbe 100644 --- a/boards/arduino-zero/Kconfig +++ b/boards/arduino-zero/Kconfig @@ -11,6 +11,7 @@ config BOARD config BOARD_ARDUINO_ZERO bool default y + select HAS_TINYUSB_DEVICE select BOARD_COMMON_ARDUINO_ZERO source "$(RIOTBOARD)/common/arduino-zero/Kconfig" diff --git a/boards/arduino-zero/Makefile.features b/boards/arduino-zero/Makefile.features index 33bc655519..bc6b85d324 100644 --- a/boards/arduino-zero/Makefile.features +++ b/boards/arduino-zero/Makefile.features @@ -1 +1,3 @@ include $(RIOTBOARD)/common/arduino-zero/Makefile.features + +FEATURES_PROVIDED += tinyusb_device diff --git a/boards/common/arduino-zero/Kconfig b/boards/common/arduino-zero/Kconfig index 89c8c60c9f..6392e0373c 100644 --- a/boards/common/arduino-zero/Kconfig +++ b/boards/common/arduino-zero/Kconfig @@ -18,7 +18,6 @@ config BOARD_COMMON_ARDUINO_ZERO select HAS_PERIPH_USBDEV select HAS_ARDUINO select HAS_ARDUINO_PWM - select HAS_TINYUSB_DEVICE select HAVE_SAUL_GPIO diff --git a/boards/common/arduino-zero/Makefile.features b/boards/common/arduino-zero/Makefile.features index 3fcd1e779b..03ea2c00bb 100644 --- a/boards/common/arduino-zero/Makefile.features +++ b/boards/common/arduino-zero/Makefile.features @@ -15,4 +15,3 @@ FEATURES_PROVIDED += periph_usbdev # Various other features (if any) FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino_pwm -FEATURES_PROVIDED += tinyusb_device