From 38ab1472e68818320fc4b7e90b26c7a9a955ae5c Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Mon, 12 Feb 2024 19:55:40 +0100 Subject: [PATCH] boards/common/makefiles/stdio_cdc_acm.dep.mk: fix This fixes compilation issues in `tests/pkg/tinyusb_netdev` with newer versions of the RISC-V toolchain due to two competing USB stacks being pulled in. With the older toolchain the build system warns: The following features may conflict: periph_usbdev tinyusb_device But builds fine (even though surprises at runtime are likely). The newer toolchain takes an issue with the same symbol being linked in more than once (and more than one instance not being `weak`). --- boards/common/makefiles/stdio_cdc_acm.dep.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/common/makefiles/stdio_cdc_acm.dep.mk b/boards/common/makefiles/stdio_cdc_acm.dep.mk index 140bf7114a..1bbdcdf911 100644 --- a/boards/common/makefiles/stdio_cdc_acm.dep.mk +++ b/boards/common/makefiles/stdio_cdc_acm.dep.mk @@ -1,5 +1,5 @@ ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) - ifneq (,$(filter tinyusb_device,$(USEMODULE))) + ifneq (,$(filter tinyusb_device,$(USEMODULE))$(filter tinyusb,$(USEPKG))) # Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly # and tinyusb_device is used for any other reason USEMODULE += stdio_tinyusb_cdc_acm