diff --git a/Makefile.features b/Makefile.features index 87ce629e94..426933bf77 100644 --- a/Makefile.features +++ b/Makefile.features @@ -23,10 +23,11 @@ FEATURES_PROVIDED += cpu_$(CPU) # Features that are conflicting for all architectures FEATURES_CONFLICT += picolibc:newlib -FEATURES_CONFLICT_MSG += "Only one standard C library can be used" +FEATURES_CONFLICT_MSG += "Only one standard C library can be used." FEATURES_CONFLICT += periph_gpio_irq:periph_gpio_ll_irq -FEATURES_CONFLICT_MSG += "Only one GPIO IRQ implementation can be used" +FEATURES_CONFLICT_MSG += "Only one GPIO IRQ implementation can be used." -FEATURES_CONFLICT += periph_usbdev:tinyusb -FEATURES_CONFLICT_MSG += "Package tinyUSB is not yet compatible with periph/usbdev" +FEATURES_CONFLICT += periph_usbdev:tinyusb_device +FEATURES_CONFLICT += periph_usbdev:tinyusb_host +FEATURES_CONFLICT_MSG += "Package tinyUSB is not yet compatible with periph_usbdev." diff --git a/pkg/tinyusb/Makefile.dep b/pkg/tinyusb/Makefile.dep index 705af2001b..1105e31ce7 100644 --- a/pkg/tinyusb/Makefile.dep +++ b/pkg/tinyusb/Makefile.dep @@ -1,9 +1,3 @@ -# Package tinyUSB has its own USB device driver. Therefore, it cannot be used -# together with periph/usbdev for now. -ifneq (,$(filter periph_usbdev,$(USEMODULE))) - $(error "Package tinyUSB is not yet compatible with periph/usbdev") -endif - # tinyUSB mutexes use priority inheritance # USEMODULE += core_mutex_priority_inheritance @@ -64,11 +58,7 @@ else ifeq (stm32,$(CPU)) else ifneq (,$(filter f0 f1 g4 l0 wb,$(CPU_FAM))) # TODO not yet working, the driver has to be ported USEMODULE += tinyusb_portable_stm32_fsdev - else - $(error STM32 family not supported) endif -else - $(error CPU $(CPU) or CPU family $(CPU_FAM) not supported) endif # other module dependencies