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

boards: fix USB configuration for stm32f429i-disco #19437

Merged
merged 2 commits into from
Mar 31, 2023
Merged

boards: fix USB configuration for stm32f429i-disco #19437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05160f9
boards/stm32f429-disc*: do not use periph_usbdev_hs
gschorcht Mar 31, 2023
281db4b
tests/usbus_cdc_ecm: blacklist stm32f429i-disco
gschorcht Mar 31, 2023
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/stm32/include/cfg_usb_otg_hs_phy_fs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extern "C" {
#define DWC2_USB_OTG_HS_ENABLED

/**
* @brief Common USB OTG FS configuration
* @brief Common USB OTG HS configuration with on-chip FS PHY
*/
static const dwc2_usb_otg_fshs_config_t dwc2_usb_otg_fshs_config[] = {
{
Expand Down
3 changes: 0 additions & 3 deletions boards/stm32f429i-disc1/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ config BOARD_STM32F429I_DISC1
select HAS_PERIPH_TIMER
select HAS_PERIPH_UART
select HAS_PERIPH_USBDEV
select HAS_PERIPH_USBDEV_HS

# Put other features for this board (in alphabetical order)
select HAS_RIOTBOOT
Expand All @@ -39,6 +38,4 @@ config BOARD_STM32F429I_DISC1
select HAVE_I3G4250D
select HAVE_L3GD20

select MODULE_PERIPH_USBDEV_HS if MODULE_PERIPH_USBDEV

source "$(RIOTBOARD)/common/stm32/Kconfig"
4 changes: 0 additions & 4 deletions boards/stm32f429i-disc1/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ifneq (,$(filter periph_usbdev,$(USEMODULE)))
USEMODULE += periph_usbdev_hs
endif

ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
USEMODULE += l3gxxxx
Expand Down
1 change: 0 additions & 1 deletion boards/stm32f429i-disc1/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev
FEATURES_PROVIDED += periph_usbdev_hs

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += riotboot
Expand Down
1 change: 1 addition & 0 deletions tests/usbus_cdc_ecm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ USEMODULE += ps
# Boards that don't have enough endpoints to use CDC ACM together with CDC ECM
ifeq (,$(filter stdio_%,$(filter-out stdio_cdc_acm,$(USEMODULE))))
BOARD_BLACKLIST += \
stm32f429i-disco \
stm32f4discovery \
weact-f401cc \
weact-f401ce \
Expand Down