Skip to content

Commit 5694937

Browse files
committed
Merge branch 'fix/fix_eth_build' into 'master'
fix(esp_eth): fixed ETH builds by forcing Ethernet init ver See merge request espressif/esp-idf!42164
2 parents 25ffd0f + 9662963 commit 5694937

File tree

10 files changed

+8
-13
lines changed

10 files changed

+8
-13
lines changed

examples/ethernet/.build-test-rules.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ examples/ethernet/iperf:
3737
- esp_driver_gpio
3838
- esp_driver_spi
3939
- cmd_system
40-
- ethernet_init
4140
- protocol_examples_common
4241

4342
examples/ethernet/ptp:

examples/ethernet/iperf/main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ dependencies:
22
cmd_system:
33
path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system
44
espressif/ethernet_init:
5-
version: "*"
5+
version: "0.7.0"
66
espressif/iperf-cmd:
77
version: "~0.1.1"

examples/ethernet/ptp/main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
espressif/ethernet_init:
3-
version: "*"
3+
version: "0.7.0"
44
esp_eth_time:
55
path: ${IDF_PATH}/examples/ethernet/ptp/components/esp_eth_time
66
ptpd:

examples/network/.build-test-rules.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,3 @@ examples/network/vlan_support:
4747
depends_components:
4848
- esp_eth
4949
- esp_netif
50-
depends_filepatterns:
51-
- examples/ethernet/basic/components/ethernet_init/**/*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
22
espressif/ethernet_init:
3-
version: "*"
3+
version: "0.7.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
22
espressif/ethernet_init:
3-
version: "*"
3+
version: "0.7.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies:
22
pcap: "^1.0.0"
33
espressif/ethernet_init:
4-
version: "*"
4+
version: "0.7.0"

examples/network/sta2eth/main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ dependencies:
88
dns_server:
99
path: ${IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server
1010
espressif/ethernet_init:
11-
version: "*"
11+
version: "0.7.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
22
espressif/ethernet_init:
3-
version: "*"
3+
version: "0.7.0"
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
dependencies:
2-
idf:
3-
version: '>=5.0'
42
espressif/ethernet_init:
5-
version: '*'
3+
version: "0.7.0"

0 commit comments

Comments
 (0)