Skip to content

Commit 9fc3989

Browse files
committed
Gate Ethernet module on managed SPI PHY components for IDF 6.
In-tree CONFIG_ETH_SPI_ETHERNET_* is gone; enable eth when espressif W5500/DM9051/KSZ8851 components are present.
1 parent b1c8938 commit 9fc3989

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/eth.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ use embedded_svc::eth::*;
1414
any(
1515
esp_idf_eth_spi_ethernet_dm9051,
1616
esp_idf_eth_spi_ethernet_w5500,
17-
esp_idf_eth_spi_ethernet_ksz8851snl
17+
esp_idf_eth_spi_ethernet_ksz8851snl,
18+
// ESP-IDF 6.0+ managed components
19+
esp_idf_comp_espressif__dm9051_enabled,
20+
esp_idf_comp_espressif__w5500_enabled,
21+
esp_idf_comp_espressif__ksz8851snl_enabled,
1822
)
1923
))]
2024
use crate::hal::gpio;

src/lib.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,18 @@ pub mod espnow;
4848
esp_idf_comp_esp_event_enabled,
4949
))]
5050
#[cfg(any(
51+
// On-chip EMAC (ESP32); RMII PHYs such as lan87xx are used only with EMAC
5152
all(esp32, esp_idf_eth_use_esp32_emac),
5253
any(
5354
esp_idf_eth_spi_ethernet_dm9051,
5455
esp_idf_eth_spi_ethernet_w5500,
55-
esp_idf_eth_spi_ethernet_ksz8851snl
56+
esp_idf_eth_spi_ethernet_ksz8851snl,
57+
// ESP-IDF 6.0+ ships SPI Ethernet PHYs as managed components
58+
esp_idf_comp_espressif__dm9051_enabled,
59+
esp_idf_comp_espressif__w5500_enabled,
60+
esp_idf_comp_espressif__ksz8851snl_enabled,
5661
),
57-
esp_idf_eth_use_openeth
62+
esp_idf_eth_use_openeth,
5863
))]
5964
pub mod eth;
6065
#[cfg(all(feature = "alloc", esp_idf_comp_esp_event_enabled))]

0 commit comments

Comments
 (0)