From 4d1f4347d98bc74305d4fc33d385a19ca57f09a5 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 26 Sep 2022 09:57:56 +0200 Subject: [PATCH] boards: enable feature tinyusb_device for nRF52 boards Since tinyUSB is not compatible with periph_usbdev, it can only be used on nRF52 boards that don't use highlevel_stdio. --- boards/nrf52840-mdk/Kconfig | 1 + boards/nrf52840-mdk/Makefile.features | 1 + boards/nrf52840dk/Kconfig | 1 + boards/nrf52840dk/Makefile.features | 1 + boards/reel/Kconfig | 1 + boards/reel/Makefile.features | 1 + boards/waveshare-nrf52840-eval-kit/Kconfig | 1 + boards/waveshare-nrf52840-eval-kit/Makefile.features | 1 + 8 files changed, 8 insertions(+) diff --git a/boards/nrf52840-mdk/Kconfig b/boards/nrf52840-mdk/Kconfig index 38b88d9cd4..d22bc62ed5 100644 --- a/boards/nrf52840-mdk/Kconfig +++ b/boards/nrf52840-mdk/Kconfig @@ -16,6 +16,7 @@ config BOARD_NRF52840_MDK select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV + select HAS_TINYUSB_DEVICE select HAS_VDD_LC_FILTER_REG1 select HAVE_SAUL_GPIO diff --git a/boards/nrf52840-mdk/Makefile.features b/boards/nrf52840-mdk/Makefile.features index 2ed3d7f90c..c1d3a9266b 100644 --- a/boards/nrf52840-mdk/Makefile.features +++ b/boards/nrf52840-mdk/Makefile.features @@ -8,5 +8,6 @@ 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/Kconfig b/boards/nrf52840dk/Kconfig index a62270c422..0cfacdd592 100644 --- a/boards/nrf52840dk/Kconfig +++ b/boards/nrf52840dk/Kconfig @@ -14,6 +14,7 @@ config BOARD_NRF52840DK select CPU_MODEL_NRF52840XXAA select HAS_PERIPH_PWM select HAS_PERIPH_USBDEV + select HAS_TINYUSB_DEVICE select HAS_VDD_LC_FILTER_REG0 select HAVE_MTD_SPI_NOR diff --git a/boards/nrf52840dk/Makefile.features b/boards/nrf52840dk/Makefile.features index 04c16f528b..0827f58b3c 100644 --- a/boards/nrf52840dk/Makefile.features +++ b/boards/nrf52840dk/Makefile.features @@ -5,4 +5,5 @@ include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features # Various other features (if any) FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_usbdev +FEATURES_PROVIDED += tinyusb_device FEATURES_PROVIDED += vdd_lc_filter_reg0 diff --git a/boards/reel/Kconfig b/boards/reel/Kconfig index 7b3717a93e..ca7b303396 100644 --- a/boards/reel/Kconfig +++ b/boards/reel/Kconfig @@ -16,6 +16,7 @@ config BOARD_REEL select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV + select HAS_TINYUSB_DEVICE select HAS_VDD_LC_FILTER_REG1 select HAVE_MMA8X5X diff --git a/boards/reel/Makefile.features b/boards/reel/Makefile.features index 2ed3d7f90c..c1d3a9266b 100644 --- a/boards/reel/Makefile.features +++ b/boards/reel/Makefile.features @@ -8,5 +8,6 @@ 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/waveshare-nrf52840-eval-kit/Kconfig b/boards/waveshare-nrf52840-eval-kit/Kconfig index ae476a22fa..ca9071bf6d 100644 --- a/boards/waveshare-nrf52840-eval-kit/Kconfig +++ b/boards/waveshare-nrf52840-eval-kit/Kconfig @@ -19,6 +19,7 @@ config BOARD_WAVESHARE_NRF52840_EVAL_KIT select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV + select HAS_TINYUSB_DEVICE select HAVE_SAUL_GPIO select HAVE_SDCARD_SPI diff --git a/boards/waveshare-nrf52840-eval-kit/Makefile.features b/boards/waveshare-nrf52840-eval-kit/Makefile.features index 7b255847ba..d90d92438f 100644 --- a/boards/waveshare-nrf52840-eval-kit/Makefile.features +++ b/boards/waveshare-nrf52840-eval-kit/Makefile.features @@ -12,3 +12,4 @@ FEATURES_PROVIDED += periph_usbdev # Other features FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino_pwm +FEATURES_PROVIDED += tinyusb_device