mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'fix/ethernet_init_ver_v6.0' into 'release/v6.0'
ci(esp_eth): use fixed version of eth_test_app (v6.0) See merge request espressif/esp-idf!51588
This commit is contained in:
@@ -44,23 +44,10 @@ static void cpp_eth_init_internal_emac(void)
|
|||||||
#endif // CONFIG_ETH_USE_ESP32_EMAC
|
#endif // CONFIG_ETH_USE_ESP32_EMAC
|
||||||
|
|
||||||
#if CONFIG_ETH_USE_SPI_ETHERNET
|
#if CONFIG_ETH_USE_SPI_ETHERNET
|
||||||
#include "ethernet_init.h"
|
|
||||||
|
|
||||||
static void cpp_eth_spi_custom_driver_config(void) __attribute__((unused));
|
static void cpp_eth_spi_custom_driver_config(void) __attribute__((unused));
|
||||||
static void cpp_eth_spi_custom_driver_config(void)
|
static void cpp_eth_spi_custom_driver_config(void)
|
||||||
{
|
{
|
||||||
volatile eth_spi_custom_driver_config_t cfg = ETH_DEFAULT_SPI;
|
volatile eth_spi_custom_driver_config_t cfg = ETH_DEFAULT_SPI;
|
||||||
(void)cfg;
|
(void)cfg;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cpp_eth_init_spi(void) __attribute__((unused));
|
|
||||||
static void cpp_eth_init_spi(void)
|
|
||||||
{
|
|
||||||
esp_eth_handle_t *handles = nullptr;
|
|
||||||
uint8_t cnt = 0;
|
|
||||||
(void)ethernet_init_all(&handles, &cnt);
|
|
||||||
if (handles != nullptr && cnt > 0) {
|
|
||||||
(void)ethernet_deinit_all(handles);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif // CONFIG_ETH_USE_SPI_ETHERNET
|
#endif // CONFIG_ETH_USE_SPI_ETHERNET
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
## IDF Component Manager Manifest File
|
## IDF Component Manager Manifest File
|
||||||
dependencies:
|
dependencies:
|
||||||
espressif/ethernet_init:
|
|
||||||
version: "^1.3.0"
|
|
||||||
espressif/eth_test_app:
|
espressif/eth_test_app:
|
||||||
version: "*"
|
version: "0.4.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user