File tree Expand file tree Collapse file tree 2 files changed +13
-1
lines changed
Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -56,4 +56,11 @@ Patch List:
5656 Impacted files:
5757 drivers/include/Legacy/stm32_hal_legacy.h
5858
59+ *stm32cube: stm32f2: excluded phy init and config
60+ exclude phy init and config as that is already
61+ done in zephyr before and we don't want it to
62+ be overwritten
63+ Impacted files:
64+ drivers/src/stm32f2xx_hal_eth.c
65+
5966 See release_note.html from STM32Cube
Original file line number Diff line number Diff line change @@ -209,7 +209,10 @@ static void ETH_InitCallbacksToDefault(ETH_HandleTypeDef *heth);
209209 */
210210HAL_StatusTypeDef HAL_ETH_Init (ETH_HandleTypeDef * heth )
211211{
212- uint32_t tmpreg1 = 0U , phyreg = 0U ;
212+ uint32_t tmpreg1 = 0U ;
213+ #ifndef __ZEPHYR__
214+ uint32_t phyreg = 0U ;
215+ #endif /* __ZEPHYR__ */
213216 uint32_t hclk = 60000000U ;
214217 uint32_t tickstart = 0U ;
215218 uint32_t err = ETH_SUCCESS ;
@@ -312,6 +315,7 @@ HAL_StatusTypeDef HAL_ETH_Init(ETH_HandleTypeDef *heth)
312315 /* Write to ETHERNET MAC MIIAR: Configure the ETHERNET CSR Clock Range */
313316 (heth -> Instance )-> MACMIIAR = (uint32_t )tmpreg1 ;
314317
318+ #ifndef __ZEPHYR__
315319 /*-------------------- PHY initialization and configuration ----------------*/
316320 /* Put the PHY in reset mode */
317321 if ((HAL_ETH_WritePHYRegister (heth , PHY_BCR , PHY_RESET )) != HAL_OK )
@@ -471,6 +475,7 @@ HAL_StatusTypeDef HAL_ETH_Init(ETH_HandleTypeDef *heth)
471475 /* Delay to assure PHY configuration */
472476 HAL_Delay (PHY_CONFIG_DELAY );
473477 }
478+ #endif /* __ZEPHYR__ */
474479
475480 /* Config MAC and DMA */
476481 ETH_MACDMAConfig (heth , err );
You can’t perform that action at this time.
0 commit comments