Merge pull request #20774 from mguetschow/nrf52-tinyusb

boards/*nrf52*: Enable tinyusb support for all nrf52-based boards
RIOT-OS · Jul 4, 2024 · 94b8b24 · 94b8b24
2 parents 436b6ed + ee12000
commit 94b8b24
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git a/boards/common/nrf52/Makefile.features b/boards/common/nrf52/Makefile.features
@@ -7,3 +7,4 @@ FEATURES_PROVIDED += periph_timer
 # Put other features for this board (in alphabetical order)
 FEATURES_PROVIDED += netif
 FEATURES_PROVIDED += riotboot
+FEATURES_PROVIDED += tinyusb_device
diff --git a/boards/common/nrf52/bootloader_nrfutil.dep.mk b/boards/common/nrf52/bootloader_nrfutil.dep.mk
@@ -1,6 +1,6 @@
 include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk
 
 # enable bootloader reset over USB, requires CDC ACM to be used
-ifneq (,$(filter stdio_cdc_acm,$(USEMODULE)))
+ifneq (,$(filter stdio_cdc_acm stdio_tinyusb_cdc_acm,$(USEMODULE)))
   USEMODULE += usb_board_reset
 endif
diff --git a/boards/nrf52840-mdk/Makefile.features b/boards/nrf52840-mdk/Makefile.features
@@ -8,6 +8,5 @@ FEATURES_PROVIDED += periph_usbdev
 FEATURES_PROVIDED += vdd_lc_filter_reg1
 
 # Various other features (if any)
-FEATURES_PROVIDED += tinyusb_device
 
 include $(RIOTBOARD)/common/nrf52/Makefile.features
diff --git a/boards/nrf52840dk/Makefile.features b/boards/nrf52840dk/Makefile.features
@@ -13,5 +13,4 @@ FEATURES_PROVIDED += arduino_spi
 FEATURES_PROVIDED += arduino_uart
 FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_usbdev
-FEATURES_PROVIDED += tinyusb_device
 FEATURES_PROVIDED += vdd_lc_filter_reg0
diff --git a/boards/waveshare-nrf52840-eval-kit/Makefile.features b/boards/waveshare-nrf52840-eval-kit/Makefile.features
@@ -15,4 +15,3 @@ FEATURES_PROVIDED += arduino_pins
 FEATURES_PROVIDED += arduino_pwm
 FEATURES_PROVIDED += arduino_shield_uno
 FEATURES_PROVIDED += sdcard_spi
-FEATURES_PROVIDED += tinyusb_device