diff options
| author | Bernard Xiong <[email protected]> | 2019-08-22 17:31:24 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-22 17:31:24 +0800 |
| commit | 61f151f463c00958f05ee646089bb0b70eb9f8cf (patch) | |
| tree | 906218a6444e39b28cf1bef2500418fcd4780213 | |
| parent | 38f109221acb5231dfb43d07a98d5dfe4a0c9409 (diff) | |
| parent | cdb70c696eb8bc6027cc1141a043fd44117dbf8c (diff) | |
Merge pull request #2981 from LaoYeNing/rtt-branch
[stm32][driver_eth] 修复开启自动协商时出错的 bug
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/drv_eth.c | 1 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c | 2 | ||||
| -rw-r--r-- | components/net/lwip-1.4.1/src/arch/sys_arch.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_eth.c b/bsp/stm32/libraries/HAL_Drivers/drv_eth.c index a258fc3821..12308a7391 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_eth.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_eth.c @@ -102,7 +102,6 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev) if (HAL_ETH_Init(&EthHandle) != HAL_OK) { LOG_E("eth hardware init failed"); - return -RT_ERROR; } else { diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c index 3e032649aa..838216ffaa 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/phy_reset.c @@ -25,4 +25,4 @@ int phy_init(void) rt_pin_write(RESET_IO, PIN_HIGH); return RT_EOK; } -INIT_APP_EXPORT(phy_init); +INIT_BOARD_EXPORT(phy_init); diff --git a/components/net/lwip-1.4.1/src/arch/sys_arch.c b/components/net/lwip-1.4.1/src/arch/sys_arch.c index b8085e69d1..c31bd59c1d 100644 --- a/components/net/lwip-1.4.1/src/arch/sys_arch.c +++ b/components/net/lwip-1.4.1/src/arch/sys_arch.c @@ -198,7 +198,7 @@ int lwip_system_init(void) return 0; } -INIT_COMPONENT_EXPORT(lwip_system_init); +INIT_PREV_EXPORT(lwip_system_init); void sys_init(void) { |