Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boards/*nrf52*: Enable tinyusb support for all nrf52-based boards #20774

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

boards/*nrf52*: Enable tinyusb support for all nrf52-based boards #20774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94296aa
boards/common/nrf52: enable usb_board_reset with tinyusb too
mguetschow Jul 4, 2024
8d06eaf
boards/*nrf52*: enable tinyusb support if periph_usbdev is present
mguetschow Jul 4, 2024
a715fce
Update cpu/nrf52/Makefile.features
mguetschow Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/common/nrf52/bootloader_nrfutil.dep.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)))
maribu marked this conversation as resolved.
Show resolved Hide resolved
USEMODULE += usb_board_reset
endif
1 change: 0 additions & 1 deletion boards/nrf52840-mdk/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion boards/nrf52840dk/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion boards/waveshare-nrf52840-eval-kit/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions cpu/nrf52/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
FEATURES_PROVIDED += netif_openwsn
endif

# tinyUSB stack is supported on nRF52 w/ USB peripheral.
# If the board has usb support, the user can choose to use tinyusb instead of usbus.
ifneq (,$(filter periph_usbdev,$(FEATURES_PROVIDED)))

Check failure on line 17 in cpu/nrf52/Makefile.features

View workflow job for this annotation

GitHub Actions / static-tests 

Modules should not check the content of FEATURES_PROVIDED/REQUIRED/OPTIONAL
FEATURES_PROVIDED += tinyusb_device
endif

# crypto features
ifneq (,$(filter nrf52840xxaa,$(CPU_MODEL)))
FEATURES_PROVIDED += periph_hash_sha_1
Expand Down
Loading