This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push: new 99a9d75 stm32f7: Remove references to BOARD_ENABLE_USBOTG_HSULPI. Prefer Kconfig option instead. 99a9d75 is described below commit 99a9d75cdd3245ed13697bf9bfa4aa6079dd8c51 Author: Anthony Merlino <anth...@vergeaero.com> AuthorDate: Mon Apr 12 19:17:26 2021 -0400 stm32f7: Remove references to BOARD_ENABLE_USBOTG_HSULPI. Prefer Kconfig option instead. --- arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c | 4 +++- arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c | 5 +++-- arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c b/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c index d724d4f..589488e 100644 --- a/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c @@ -211,7 +211,9 @@ static inline void rcc_enableahb1(void) #endif #ifdef CONFIG_STM32F7_OTGFSHS -#if defined(CONFIG_STM32F7_INTERNAL_ULPI) || defined(CONFIG_STM32F7_EXTERNAL_ULPI) +# if defined(CONFIG_STM32F7_INTERNAL_ULPI) || + defined(CONFIG_STM32F7_EXTERNAL_ULPI) + /* Enable clocking for USB OTG HS and external PHY */ regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN); diff --git a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c index 8643801..e288291 100644 --- a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c @@ -215,12 +215,13 @@ static inline void rcc_enableahb1(void) #endif #ifdef CONFIG_STM32F7_OTGFSHS - #if defined(CONFIG_STM32F7_INTERNAL_ULPI) || defined(CONFIG_STM32F7_EXTERNAL_ULPI) +# if defined(CONFIG_STM32F7_INTERNAL_ULPI) || \ + defined(CONFIG_STM32F7_EXTERNAL_ULPI) + /* Enable clocking for USB OTG HS and external PHY */ regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN); #else - /* Enable only clocking for USB OTG HS */ regval |= RCC_AHB1ENR_OTGHSEN; diff --git a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c index ed1bc93..32f2a62 100644 --- a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c +++ b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c @@ -221,7 +221,9 @@ static inline void rcc_enableahb1(void) #endif #ifdef CONFIG_STM32F7_OTGFSHS -#ifdef BOARD_ENABLE_USBOTG_HSULPI +# if defined(CONFIG_STM32F7_INTERNAL_ULPI) || \ + defined(CONFIG_STM32F7_EXTERNAL_ULPI) + /* Enable clocking for USB OTG HS and external PHY */ regval |= (RCC_AHB1ENR_OTGHSEN | RCC_AHB1ENR_OTGHSULPIEN);