Skip to content

Commit b611c16

Browse files
AdrianSoundyAdrianSoundy
authored
Fixes Ethernet support in latest builds (#2247)
* Fix Ethernet support as broken
1 parent 70963fd commit b611c16

18 files changed

+1911
-138
lines changed

‎targets/ESP32/_IDF/sdkconfig.debug_nopsram_ble.esp32‎

Lines changed: 1468 additions & 0 deletions
Large diffs are not rendered by default.

‎targets/ESP32/_IDF/sdkconfig.default‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
272272

273273
#
274274
# Ethernet
275+
#
276+
# Parameters configured in binutils.ESP32.CMAKE
275277
#
276278
CONFIG_ETH_ENABLED=y
279+
CONFIG_ETH_USE_ESP32_EMAC=y
280+
281+
CONFIG_ETH_PHY_INTERFACE_RMII=y
282+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
283+
284+
CONFIG_ETH_RMII_CLK_OUTPUT=y
285+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
286+
#CONFIG_ETH_RMII_CLK_INPUT=y
287+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
288+
289+
CONFIG_ETH_DMA_BUFFER_SIZE=512
290+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
291+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
292+
293+
# Include SPI drivers in case used in build
277294
CONFIG_ETH_USE_SPI_ETHERNET=y
278-
#CONFIG_ETH_RMII_CLK_OUTPUT=y
279-
#CONFIG_ETH_RMII_CLK_OUT_GPIO=n
280-
# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
281-
# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
282-
# CONFIG_ETH_USE_OPENETH is not set
295+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
296+
CONFIG_ETH_SPI_ETHERNET_W5500=y
297+
CONFIG_ETH_USE_OPENETH=y
283298
# end of Ethernet
284299

285300
#

‎targets/ESP32/_IDF/sdkconfig.default.esp32‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,33 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
364364
CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
365365
# end of Common ESP-related
366366

367+
#
368+
# Ethernet
369+
#
370+
# Parameters configured in binutils.ESP32.CMAKE
371+
#
372+
CONFIG_ETH_ENABLED=y
373+
CONFIG_ETH_USE_ESP32_EMAC=y
374+
375+
CONFIG_ETH_PHY_INTERFACE_RMII=y
376+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
377+
378+
CONFIG_ETH_RMII_CLK_OUTPUT=y
379+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
380+
#CONFIG_ETH_RMII_CLK_INPUT=y
381+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
382+
383+
CONFIG_ETH_DMA_BUFFER_SIZE=512
384+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
385+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
386+
387+
# Include SPI drivers in case used in build
388+
CONFIG_ETH_USE_SPI_ETHERNET=y
389+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
390+
CONFIG_ETH_SPI_ETHERNET_W5500=y
391+
CONFIG_ETH_USE_OPENETH=y
392+
# end of Ethernet
393+
367394
#
368395
# Event Loop Library
369396
#

‎targets/ESP32/_IDF/sdkconfig.default.esp32s2‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
366366

367367
#
368368
# Ethernet
369+
#
370+
# Parameters configured in binutils.ESP32.CMAKE
369371
#
370372
CONFIG_ETH_ENABLED=y
373+
CONFIG_ETH_USE_ESP32_EMAC=y
374+
375+
CONFIG_ETH_PHY_INTERFACE_RMII=y
376+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
377+
378+
CONFIG_ETH_RMII_CLK_OUTPUT=y
379+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
380+
#CONFIG_ETH_RMII_CLK_INPUT=y
381+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
382+
383+
CONFIG_ETH_DMA_BUFFER_SIZE=512
384+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
385+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
386+
387+
# Include SPI drivers in case used in build
371388
CONFIG_ETH_USE_SPI_ETHERNET=y
372-
# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
373-
# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
374-
# CONFIG_ETH_USE_OPENETH is not set
389+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
390+
CONFIG_ETH_SPI_ETHERNET_W5500=y
391+
CONFIG_ETH_USE_OPENETH=n
375392
# end of Ethernet
376393

377394
#

‎targets/ESP32/_IDF/sdkconfig.default_ble.esp32‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
369369

370370
#
371371
# Ethernet
372+
#
373+
# Parameters configured in binutils.ESP32.CMAKE
372374
#
373375
CONFIG_ETH_ENABLED=y
376+
CONFIG_ETH_USE_ESP32_EMAC=y
377+
378+
CONFIG_ETH_PHY_INTERFACE_RMII=y
379+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
380+
381+
CONFIG_ETH_RMII_CLK_OUTPUT=y
382+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
383+
#CONFIG_ETH_RMII_CLK_INPUT=y
384+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
385+
386+
CONFIG_ETH_DMA_BUFFER_SIZE=512
387+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
388+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
389+
390+
# Include SPI drivers in case used in build
374391
CONFIG_ETH_USE_SPI_ETHERNET=y
375-
# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
376-
# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
377-
# CONFIG_ETH_USE_OPENETH is not set
392+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
393+
CONFIG_ETH_SPI_ETHERNET_W5500=y
394+
CONFIG_ETH_USE_OPENETH=y
378395
# end of Ethernet
379396

380397
#

‎targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
368368

369369
#
370370
# Ethernet
371+
#
372+
# Parameters configured in binutils.ESP32.CMAKE
371373
#
372374
CONFIG_ETH_ENABLED=y
375+
CONFIG_ETH_USE_ESP32_EMAC=y
376+
377+
CONFIG_ETH_PHY_INTERFACE_RMII=y
378+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
379+
380+
CONFIG_ETH_RMII_CLK_OUTPUT=y
381+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
382+
#CONFIG_ETH_RMII_CLK_INPUT=y
383+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
384+
385+
CONFIG_ETH_DMA_BUFFER_SIZE=512
386+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
387+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
388+
389+
# Include SPI drivers in case used in build
373390
CONFIG_ETH_USE_SPI_ETHERNET=y
374-
# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
375-
# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
376-
# CONFIG_ETH_USE_OPENETH is not set
391+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
392+
CONFIG_ETH_SPI_ETHERNET_W5500=y
393+
CONFIG_ETH_USE_OPENETH=y
377394
# end of Ethernet
378395

379396
#

‎targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
343343

344344
#
345345
# Ethernet
346+
#
347+
# Parameters configured in binutils.ESP32.CMAKE
346348
#
347-
CONFIG_ETH_ENABLED=n
349+
CONFIG_ETH_ENABLED=y
350+
CONFIG_ETH_USE_ESP32_EMAC=y
351+
352+
CONFIG_ETH_PHY_INTERFACE_RMII=y
353+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
354+
355+
CONFIG_ETH_RMII_CLK_OUTPUT=y
356+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
357+
#CONFIG_ETH_RMII_CLK_INPUT=y
358+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
359+
360+
CONFIG_ETH_DMA_BUFFER_SIZE=512
361+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
362+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
363+
364+
# Include SPI drivers in case used in build
365+
CONFIG_ETH_USE_SPI_ETHERNET=y
366+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
367+
CONFIG_ETH_SPI_ETHERNET_W5500=y
368+
CONFIG_ETH_USE_OPENETH=y
348369
# end of Ethernet
349370

350371
#

‎targets/ESP32/_IDF/sdkconfig.default_nopsram_ble.esp32‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,21 +474,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y
474474

475475
#
476476
# Ethernet
477+
#
478+
# Parameters configured in binutils.ESP32.CMAKE
477479
#
478480
CONFIG_ETH_ENABLED=y
479481
CONFIG_ETH_USE_ESP32_EMAC=y
482+
480483
CONFIG_ETH_PHY_INTERFACE_RMII=y
481484
# CONFIG_ETH_PHY_INTERFACE_MII is not set
482-
CONFIG_ETH_RMII_CLK_INPUT=y
483-
# CONFIG_ETH_RMII_CLK_OUTPUT is not set
484-
CONFIG_ETH_RMII_CLK_IN_GPIO=0
485+
486+
CONFIG_ETH_RMII_CLK_OUTPUT=y
487+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
488+
#CONFIG_ETH_RMII_CLK_INPUT=y
489+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
490+
485491
CONFIG_ETH_DMA_BUFFER_SIZE=512
486492
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
487493
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
494+
495+
# Include SPI drivers in case used in build
488496
CONFIG_ETH_USE_SPI_ETHERNET=y
489-
# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
490-
# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
491-
# CONFIG_ETH_USE_OPENETH is not set
497+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
498+
CONFIG_ETH_SPI_ETHERNET_W5500=y
499+
CONFIG_ETH_USE_OPENETH=y
492500
# end of Ethernet
493501

494502
#

‎targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
344344

345345
#
346346
# Ethernet
347+
#
348+
# Parameters configured in binutils.ESP32.CMAKE
347349
#
348-
CONFIG_ETH_ENABLED=n
350+
CONFIG_ETH_ENABLED=y
351+
CONFIG_ETH_USE_ESP32_EMAC=y
352+
353+
CONFIG_ETH_PHY_INTERFACE_RMII=y
354+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
355+
356+
CONFIG_ETH_RMII_CLK_OUTPUT=y
357+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
358+
#CONFIG_ETH_RMII_CLK_INPUT=y
359+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
360+
361+
CONFIG_ETH_DMA_BUFFER_SIZE=512
362+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
363+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
364+
365+
# Include SPI drivers in case used in build
366+
CONFIG_ETH_USE_SPI_ETHERNET=y
367+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
368+
CONFIG_ETH_SPI_ETHERNET_W5500=y
369+
CONFIG_ETH_USE_OPENETH=y
349370
# end of Ethernet
350371

351372
#

‎targets/ESP32/_IDF/sdkconfig.default_pico‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,29 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
343343

344344
#
345345
# Ethernet
346+
#
347+
# Parameters configured in binutils.ESP32.CMAKE
346348
#
347-
CONFIG_ETH_ENABLED=n
349+
CONFIG_ETH_ENABLED=y
350+
CONFIG_ETH_USE_ESP32_EMAC=y
351+
352+
CONFIG_ETH_PHY_INTERFACE_RMII=y
353+
# CONFIG_ETH_PHY_INTERFACE_MII is not set
354+
355+
CONFIG_ETH_RMII_CLK_OUTPUT=y
356+
CONFIG_ETH_RMII_CLK_OUT_GPIO=17
357+
#CONFIG_ETH_RMII_CLK_INPUT=y
358+
#CONFIG_ETH_RMII_CLK_IN_GPIO=n
359+
360+
CONFIG_ETH_DMA_BUFFER_SIZE=512
361+
CONFIG_ETH_DMA_RX_BUFFER_NUM=10
362+
CONFIG_ETH_DMA_TX_BUFFER_NUM=10
363+
364+
# Include SPI drivers in case used in build
365+
CONFIG_ETH_USE_SPI_ETHERNET=y
366+
CONFIG_ETH_SPI_ETHERNET_DM9051=y
367+
CONFIG_ETH_SPI_ETHERNET_W5500=y
368+
CONFIG_ETH_USE_OPENETH=y
348369
# end of Ethernet
349370

350371
#

0 commit comments

Comments
 (0)