From c9711b4d5b83c217bfdf92af0db9973dca72c60d Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Wed, 8 Feb 2023 15:03:08 +0100 Subject: [PATCH] boards/esp32s3-pros3: add `usbus_%` dependency in STDIO selection --- boards/esp32s3-pros3/Kconfig | 3 +-- boards/esp32s3-pros3/Makefile.dep | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/boards/esp32s3-pros3/Kconfig b/boards/esp32s3-pros3/Kconfig index bd5da9bd17..72f596ee83 100644 --- a/boards/esp32s3-pros3/Kconfig +++ b/boards/esp32s3-pros3/Kconfig @@ -24,10 +24,9 @@ config BOARD_ESP32S3_PROS3 select HAS_PERIPH_USBDEV select HAS_TINYUSB_DEVICE select MODULE_USB_BOARD_RESET if TEST_KCONFIG && MODULE_STDIO_USB_SERIAL_JTAG + select MODULE_USBUS_CDC_ACM if MODULE_USBUS choice STDIO_IMPLEMENTATION - bool "STDIO implementation" - depends on TEST_KCONFIG default MODULE_STDIO_CDC_ACM if MODULE_USBUS default MODULE_STDIO_TINYUSB_CDC_ACM if MODULE_TINYUSB_DEVICE default MODULE_STDIO_USB_SERIAL_JTAG if !MODULE_USBUS && !MODULE_TINYUSB_DEVICE diff --git a/boards/esp32s3-pros3/Makefile.dep b/boards/esp32s3-pros3/Makefile.dep index 788ba9bd96..c2e382f787 100644 --- a/boards/esp32s3-pros3/Makefile.dep +++ b/boards/esp32s3-pros3/Makefile.dep @@ -1,4 +1,4 @@ -ifeq (,$(filter stdio_% slipdev_stdio usbus tinyusb_device,$(USEMODULE))) +ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE))) # Use stdio_usb_serial_jtag if no other stdio is requested explicitly # and neither USBUS nor tinyusb_device are used USEMODULE += stdio_usb_serial_jtag