diff --git a/components/esp_eth/src/openeth/esp_openeth.h b/components/esp_eth/src/openeth/esp_openeth.h index 2aab7410c1..8fe99d92e7 100644 --- a/components/esp_eth/src/openeth/esp_openeth.h +++ b/components/esp_eth/src/openeth/esp_openeth.h @@ -13,7 +13,7 @@ * we can reuse the Wifi interrupt source for ethernet, since QEMU doesn't emulate Wifi (yet). * We also map the EMAC registers to an unused address range. */ -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 + #if SOC_WIFI_SUPPORTED && !SOC_EMAC_SUPPORTED #define ETS_ETH_MAC_INTR_SOURCE ETS_WIFI_MAC_INTR_SOURCE #define DR_REG_EMAC_BASE 0x600CD000 #endif diff --git a/components/esp_netif/test_apps/test_app_vfs_l2tap/main/test_vfs_l2tap.c b/components/esp_netif/test_apps/test_app_vfs_l2tap/main/test_vfs_l2tap.c index 208951319a..5435b37de7 100644 --- a/components/esp_netif/test_apps/test_app_vfs_l2tap/main/test_vfs_l2tap.c +++ b/components/esp_netif/test_apps/test_app_vfs_l2tap/main/test_vfs_l2tap.c @@ -20,7 +20,6 @@ #include "esp_eth.h" #include "esp_event.h" #include "esp_log.h" -#include "driver/gpio.h" #include "sdkconfig.h" #include "arpa/inet.h" // for ntohs, etc. #include "lwip/prot/ethernet.h" // Ethernet headers diff --git a/examples/common_components/protocol_examples_common/CMakeLists.txt b/examples/common_components/protocol_examples_common/CMakeLists.txt index 8d0501a9b1..56b6b03566 100644 --- a/examples/common_components/protocol_examples_common/CMakeLists.txt +++ b/examples/common_components/protocol_examples_common/CMakeLists.txt @@ -33,14 +33,14 @@ endif() idf_component_register(SRCS "${srcs}" INCLUDE_DIRS "include" - PRIV_REQUIRES esp_netif esp_driver_gpio esp_driver_uart esp_wifi vfs console esp_eth openthread) + PRIV_REQUIRES esp_netif esp_driver_gpio esp_driver_uart esp_wifi vfs console openthread) if(CONFIG_EXAMPLE_PROVIDE_WIFI_CONSOLE_CMD) idf_component_optional_requires(PRIVATE console) endif() if(CONFIG_EXAMPLE_CONNECT_ETHERNET) - idf_component_optional_requires(PUBLIC esp_eth) + idf_component_optional_requires(PRIVATE esp_eth) endif() if(CONFIG_EXAMPLE_CONNECT_THREAD) diff --git a/examples/common_components/protocol_examples_common/Kconfig.projbuild b/examples/common_components/protocol_examples_common/Kconfig.projbuild index 4286042bb0..65efe53fbd 100644 --- a/examples/common_components/protocol_examples_common/Kconfig.projbuild +++ b/examples/common_components/protocol_examples_common/Kconfig.projbuild @@ -122,100 +122,13 @@ menu "Example Connection Configuration" default y if !EXAMPLE_CONNECT_WIFI && !EXAMPLE_CONNECT_THREAD help Protocol examples can use Wi-Fi, Ethernet and/or Thread to connect to the network. - Choose this option to connect with Ethernet + Choose this option to enable connection with Ethernet. + Go to `Top -> Ethernet Configuration` to configure the Ethernet interface. - if EXAMPLE_CONNECT_ETHERNET - config EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE - int "emac_rx task stack size" - default 2048 - help - This set stack size for emac_rx task - - config EXAMPLE_USE_SPI_ETHERNET - bool - - choice EXAMPLE_ETHERNET_TYPE - prompt "Ethernet Type" - default EXAMPLE_USE_INTERNAL_ETHERNET if SOC_EMAC_SUPPORTED - default EXAMPLE_USE_DUMMY - help - Select which kind of Ethernet will be used in the example. - - config EXAMPLE_USE_INTERNAL_ETHERNET - depends on SOC_EMAC_SUPPORTED - select ETH_USE_ESP32_EMAC - bool "Internal EMAC" - help - Select internal Ethernet MAC controller. - - config EXAMPLE_USE_DUMMY - bool "DUMMY Module" - select ETH_USE_SPI_ETHERNET - help - Dummy option to just to pass builds, will be fixed by IDF-14059 - - config EXAMPLE_USE_OPENETH - bool "OpenCores Ethernet MAC (EXPERIMENTAL)" - select ETH_USE_OPENETH - help - When this option is enabled, the example is built with support for - OpenCores Ethernet MAC, which allows testing the example in QEMU. - Note that this option is used for internal testing purposes, and - not officially supported. Examples built with this option enabled - will not run on a real ESP32 chip. - - endchoice # EXAMPLE_ETHERNET_TYPE - - if EXAMPLE_USE_INTERNAL_ETHERNET - choice EXAMPLE_ETH_PHY_MODEL - prompt "Ethernet PHY Device" - default EXAMPLE_ETH_PHY_GENERIC - help - Select the Ethernet PHY device to use in the example. - - config EXAMPLE_ETH_PHY_GENERIC - bool "Generic 802.3 PHY" - help - Any Ethernet PHY chip compliant with IEEE 802.3 can be used. However, while - basic functionality should always work, some specific features might be limited, - even if the PHY meets IEEE 802.3 standard. A typical example is loopback - functionality, where certain PHYs may require setting a specific speed mode to - operate correctly. - endchoice - - config EXAMPLE_ETH_MDC_GPIO - int "SMI MDC GPIO number" - range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 23 if IDF_TARGET_ESP32 - default 31 if IDF_TARGET_ESP32P4 - help - Set the GPIO number used by SMI MDC. - - config EXAMPLE_ETH_MDIO_GPIO - int "SMI MDIO GPIO number" - range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 18 if IDF_TARGET_ESP32 - default 52 if IDF_TARGET_ESP32P4 - help - Set the GPIO number used by SMI MDIO. - endif - - config EXAMPLE_ETH_PHY_RST_GPIO - int "PHY Reset GPIO number" - range -1 ENV_GPIO_OUT_RANGE_MAX - default 51 if IDF_TARGET_ESP32P4 - default 5 - help - Set the GPIO number used to reset PHY chip. - Set to -1 to disable PHY chip hardware reset. - - config EXAMPLE_ETH_PHY_ADDR - int "PHY Address" - range 0 31 if EXAMPLE_USE_INTERNAL_ETHERNET - default 1 - help - Set PHY address according your board schematic. - endif # EXAMPLE_CONNECT_ETHERNET + config EXAMPLE_DISABLE_ETHERNET_CONFIG + bool + select ETHERNET_INIT_OVERRIDE_DISABLE + default y if !EXAMPLE_CONNECT_ETHERNET config EXAMPLE_CONNECT_PPP bool "connect using Point to Point interface" diff --git a/examples/common_components/protocol_examples_common/eth_connect.c b/examples/common_components/protocol_examples_common/eth_connect.c index 0361ab62f3..86eec3989f 100644 --- a/examples/common_components/protocol_examples_common/eth_connect.c +++ b/examples/common_components/protocol_examples_common/eth_connect.c @@ -9,6 +9,7 @@ #include "example_common_private.h" #include "esp_event.h" #include "esp_eth.h" +#include "ethernet_init.h" #include "esp_log.h" #include "esp_mac.h" #include "driver/gpio.h" @@ -72,17 +73,15 @@ static void on_eth_event(void *esp_netif, esp_event_base_t event_base, #endif // CONFIG_EXAMPLE_CONNECT_IPV6 -static esp_eth_handle_t s_eth_handle = NULL; -static esp_eth_mac_t *s_mac = NULL; -static esp_eth_phy_t *s_phy = NULL; +static esp_eth_handle_t *s_eth_handles = NULL; +static uint8_t s_eth_count = 0; static esp_eth_netif_glue_handle_t s_eth_glue = NULL; +static esp_netif_t *s_eth_netif = NULL; static esp_netif_t *eth_start(void) { -// TODO just to pass builds, will be fixed by IDF-14059 -#if CONFIG_EXAMPLE_USE_DUMMY - return NULL; -#else + ESP_ERROR_CHECK(ethernet_init_all(&s_eth_handles, &s_eth_count)); + esp_netif_inherent_config_t esp_netif_config = ESP_NETIF_INHERENT_DEFAULT_ETH(); // Warning: the interface desc is used in tests to capture actual connection details (IP, gw, mask) esp_netif_config.if_desc = EXAMPLE_NETIF_DESC_ETH; @@ -91,69 +90,39 @@ static esp_netif_t *eth_start(void) .base = &esp_netif_config, .stack = ESP_NETIF_NETSTACK_DEFAULT_ETH }; - esp_netif_t *netif = esp_netif_new(&netif_config); - assert(netif); + s_eth_netif = esp_netif_new(&netif_config); - eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG(); - mac_config.rx_task_stack_size = CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE; - eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG(); - phy_config.phy_addr = CONFIG_EXAMPLE_ETH_PHY_ADDR; - phy_config.reset_gpio_num = CONFIG_EXAMPLE_ETH_PHY_RST_GPIO; -#if CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET - eth_esp32_emac_config_t esp32_emac_config = ETH_ESP32_EMAC_DEFAULT_CONFIG(); - esp32_emac_config.smi_gpio.mdc_num = CONFIG_EXAMPLE_ETH_MDC_GPIO; - esp32_emac_config.smi_gpio.mdio_num = CONFIG_EXAMPLE_ETH_MDIO_GPIO; - s_mac = esp_eth_mac_new_esp32(&esp32_emac_config, &mac_config); -#if CONFIG_EXAMPLE_ETH_PHY_GENERIC - s_phy = esp_eth_phy_new_generic(&phy_config); -#endif // CONFIG_EXAMPLE_ETH_PHY_GENERIC -#elif CONFIG_EXAMPLE_USE_OPENETH - phy_config.autonego_timeout_ms = 100; - s_mac = esp_eth_mac_new_openeth(&mac_config); - s_phy = esp_eth_phy_new_generic(&phy_config); -#endif // CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET - - // Install Ethernet driver - esp_eth_config_t config = ETH_DEFAULT_CONFIG(s_mac, s_phy); - ESP_ERROR_CHECK(esp_eth_driver_install(&config, &s_eth_handle)); - - // combine driver with netif - s_eth_glue = esp_eth_new_netif_glue(s_eth_handle); - esp_netif_attach(netif, s_eth_glue); + s_eth_glue = esp_eth_new_netif_glue(s_eth_handles[0]); + esp_netif_attach(s_eth_netif, s_eth_glue); // Register user defined event handlers ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, ð_on_got_ip, NULL)); #ifdef CONFIG_EXAMPLE_CONNECT_IPV6 - ESP_ERROR_CHECK(esp_event_handler_register(ETH_EVENT, ETHERNET_EVENT_CONNECTED, &on_eth_event, netif)); + ESP_ERROR_CHECK(esp_event_handler_register(ETH_EVENT, ETHERNET_EVENT_CONNECTED, &on_eth_event, s_eth_netif)); ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_GOT_IP6, ð_on_got_ipv6, NULL)); #endif - esp_eth_start(s_eth_handle); - return netif; -#endif // CONFIG_EXAMPLE_USE_DUMMY + ESP_ERROR_CHECK(esp_eth_start(s_eth_handles[0])); + + return s_eth_netif; } static void eth_stop(void) { - esp_netif_t *eth_netif = get_example_netif_from_desc(EXAMPLE_NETIF_DESC_ETH); ESP_ERROR_CHECK(esp_event_handler_unregister(IP_EVENT, IP_EVENT_ETH_GOT_IP, ð_on_got_ip)); #if CONFIG_EXAMPLE_CONNECT_IPV6 ESP_ERROR_CHECK(esp_event_handler_unregister(IP_EVENT, IP_EVENT_GOT_IP6, ð_on_got_ipv6)); ESP_ERROR_CHECK(esp_event_handler_unregister(ETH_EVENT, ETHERNET_EVENT_CONNECTED, &on_eth_event)); #endif - ESP_ERROR_CHECK(esp_eth_stop(s_eth_handle)); + ESP_ERROR_CHECK(esp_eth_stop(s_eth_handles[0])); ESP_ERROR_CHECK(esp_eth_del_netif_glue(s_eth_glue)); - ESP_ERROR_CHECK(esp_eth_driver_uninstall(s_eth_handle)); - s_eth_handle = NULL; - ESP_ERROR_CHECK(s_phy->del(s_phy)); - ESP_ERROR_CHECK(s_mac->del(s_mac)); + esp_netif_destroy(s_eth_netif); + ethernet_deinit_all(s_eth_handles); - esp_netif_destroy(eth_netif); -} - -esp_eth_handle_t get_example_eth_handle(void) -{ - return s_eth_handle; + s_eth_glue = NULL; + s_eth_netif = NULL; + s_eth_handles = NULL; + s_eth_count = 0; } /* tear down connection, release resources */ diff --git a/examples/common_components/protocol_examples_common/idf_component.yml b/examples/common_components/protocol_examples_common/idf_component.yml new file mode 100644 index 0000000000..895b43e630 --- /dev/null +++ b/examples/common_components/protocol_examples_common/idf_component.yml @@ -0,0 +1,5 @@ +dependencies: + espressif/ethernet_init: + version: "~1.2.0" + rules: + - if: "target != linux" diff --git a/examples/common_components/protocol_examples_common/include/protocol_examples_common.h b/examples/common_components/protocol_examples_common/include/protocol_examples_common.h index 54e2c07a11..d69abd10fe 100644 --- a/examples/common_components/protocol_examples_common/include/protocol_examples_common.h +++ b/examples/common_components/protocol_examples_common/include/protocol_examples_common.h @@ -13,9 +13,6 @@ #include "esp_err.h" #if !CONFIG_IDF_TARGET_LINUX #include "esp_netif.h" -#if CONFIG_EXAMPLE_CONNECT_ETHERNET -#include "esp_eth.h" -#endif #endif // !CONFIG_IDF_TARGET_LINUX #ifdef __cplusplus @@ -136,15 +133,6 @@ esp_netif_t *get_example_netif_from_desc(const char *desc); void example_register_wifi_connect_commands(void); #endif -#if CONFIG_EXAMPLE_CONNECT_ETHERNET -/** - * @brief Get the example Ethernet driver handle - * - * @return esp_eth_handle_t - */ -esp_eth_handle_t get_example_eth_handle(void); -#endif // CONFIG_EXAMPLE_CONNECT_ETHERNET - #else static inline esp_err_t example_connect(void) {return ESP_OK;} #endif // !CONFIG_IDF_TARGET_LINUX diff --git a/examples/common_components/protocol_examples_common/sdkconfig.rename b/examples/common_components/protocol_examples_common/sdkconfig.rename index fccfd425c2..9f26066452 100644 --- a/examples/common_components/protocol_examples_common/sdkconfig.rename +++ b/examples/common_components/protocol_examples_common/sdkconfig.rename @@ -1 +1,23 @@ -CONFIG_EXAMPLE_ETH_PHY_IP101 CONFIG_EXAMPLE_ETH_PHY_GENERIC +CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE CONFIG_ETHERNET_RX_TASK_STACK_SIZE +CONFIG_EXAMPLE_USE_SPI_ETHERNET CONFIG_ETHERNET_SPI_SUPPORT +CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET CONFIG_ETHERNET_INTERNAL_SUPPORT +CONFIG_EXAMPLE_USE_DM9051 CONFIG_ETHERNET_SPI_DEV0_DM9051 +CONFIG_EXAMPLE_USE_W5500 CONFIG_ETHERNET_SPI_DEV0_W5500 +CONFIG_EXAMPLE_USE_OPENETH CONFIG_ETHERNET_OPENETH_SUPPORT +CONFIG_EXAMPLE_ETH_PHY_GENERIC CONFIG_ETHERNET_PHY_GENERIC +CONFIG_EXAMPLE_ETH_PHY_IP101 CONFIG_ETHERNET_PHY_IP101 +CONFIG_EXAMPLE_ETH_PHY_RTL8201 CONFIG_ETHERNET_PHY_RTL8201 +CONFIG_EXAMPLE_ETH_PHY_LAN87XX CONFIG_ETHERNET_PHY_LAN87XX +CONFIG_EXAMPLE_ETH_PHY_DP83848 CONFIG_ETHERNET_PHY_DP83848 +CONFIG_EXAMPLE_ETH_PHY_KSZ80XX CONFIG_ETHERNET_PHY_KSZ80XX +CONFIG_EXAMPLE_ETH_MDC_GPIO CONFIG_ETHERNET_MDC_GPIO +CONFIG_EXAMPLE_ETH_MDIO_GPIO CONFIG_ETHERNET_MDIO_GPIO +CONFIG_EXAMPLE_ETH_SPI_HOST CONFIG_ETHERNET_SPI_HOST +CONFIG_EXAMPLE_ETH_SPI_SCLK_GPIO CONFIG_ETHERNET_SPI_SCLK_GPIO +CONFIG_EXAMPLE_ETH_SPI_MOSI_GPIO CONFIG_ETHERNET_SPI_MOSI_GPIO +CONFIG_EXAMPLE_ETH_SPI_MISO_GPIO CONFIG_ETHERNET_SPI_MISO_GPIO +CONFIG_EXAMPLE_ETH_SPI_CS_GPIO CONFIG_ETHERNET_SPI_CS0_GPIO +CONFIG_EXAMPLE_ETH_SPI_CLOCK_MHZ CONFIG_ETHERNET_SPI_CLOCK_MHZ +CONFIG_EXAMPLE_ETH_SPI_INT_GPIO CONFIG_ETHERNET_SPI_INT0_GPIO +CONFIG_EXAMPLE_ETH_PHY_RST_GPIO CONFIG_ETHERNET_PHY_RST_GPIO +CONFIG_EXAMPLE_ETH_PHY_ADDR CONFIG_ETHERNET_PHY_ADDR diff --git a/examples/ethernet/iperf/README.md b/examples/ethernet/iperf/README.md index 0005ee58d2..9ead02baa1 100644 --- a/examples/ethernet/iperf/README.md +++ b/examples/ethernet/iperf/README.md @@ -22,10 +22,6 @@ Besides that, `esp_eth` component can drive third-party Ethernet module which in > [!NOTE] > `Generic 802.3 PHY` basic functionality should always work for PHY compliant with IEEE 802.3. However, some specific features might be limited. A typical example is loopback functionality, where certain PHYs may require setting a specific speed mode to operate correctly. If this is a case, use driver tailored to that specific chip. -#### Pin Assignment - -See common pin assignments for Ethernet examples from [upper level](../README.md#common-pin-assignments). - ### Software Tools Preparation 1. Install iperf tool on PC diff --git a/examples/ethernet/iperf/main/idf_component.yml b/examples/ethernet/iperf/main/idf_component.yml index d597c44dc6..47e0d941b9 100644 --- a/examples/ethernet/iperf/main/idf_component.yml +++ b/examples/ethernet/iperf/main/idf_component.yml @@ -2,6 +2,6 @@ dependencies: cmd_system: path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" espressif/iperf-cmd: version: "~0.1.1" diff --git a/examples/ethernet/iperf/sdkconfig.ci.default_dm9051 b/examples/ethernet/iperf/sdkconfig.ci.default_dm9051 index 811427ed65..ce5cc7e7f8 100644 --- a/examples/ethernet/iperf/sdkconfig.ci.default_dm9051 +++ b/examples/ethernet/iperf/sdkconfig.ci.default_dm9051 @@ -39,6 +39,6 @@ CONFIG_ETH_IRAM_OPTIMIZATION=y # Config Ethernet Init CONFIG_ETHERNET_SPI_SUPPORT=y CONFIG_ETHERNET_INTERNAL_SUPPORT=n -CONFIG_ETHERNET_SPI_NUMBER=1 CONFIG_ETHERNET_SPI_DEV0_DM9051=y +CONFIG_ETHERNET_SPI_DEV1_NONE=y CONFIG_ETHERNET_SPI_CLOCK_MHZ=20 diff --git a/examples/ethernet/iperf/sdkconfig.ci.default_ksz8851snl b/examples/ethernet/iperf/sdkconfig.ci.default_ksz8851snl index 3afa041a4a..298561ddee 100644 --- a/examples/ethernet/iperf/sdkconfig.ci.default_ksz8851snl +++ b/examples/ethernet/iperf/sdkconfig.ci.default_ksz8851snl @@ -39,6 +39,6 @@ CONFIG_ETH_IRAM_OPTIMIZATION=y # Config Ethernet Init CONFIG_ETHERNET_SPI_SUPPORT=y CONFIG_ETHERNET_INTERNAL_SUPPORT=n -CONFIG_ETHERNET_SPI_NUMBER=1 CONFIG_ETHERNET_SPI_DEV0_KSZ8851SNL=y +CONFIG_ETHERNET_SPI_DEV1_NONE=y CONFIG_ETHERNET_SPI_CLOCK_MHZ=20 diff --git a/examples/ethernet/iperf/sdkconfig.ci.default_w5500 b/examples/ethernet/iperf/sdkconfig.ci.default_w5500 index e83c4041db..860f115a74 100644 --- a/examples/ethernet/iperf/sdkconfig.ci.default_w5500 +++ b/examples/ethernet/iperf/sdkconfig.ci.default_w5500 @@ -39,6 +39,6 @@ CONFIG_ETH_IRAM_OPTIMIZATION=y # Config Ethernet Init CONFIG_ETHERNET_SPI_SUPPORT=y CONFIG_ETHERNET_INTERNAL_SUPPORT=n -CONFIG_ETHERNET_SPI_NUMBER=1 CONFIG_ETHERNET_SPI_DEV0_W5500=y +CONFIG_ETHERNET_SPI_DEV1_NONE=y CONFIG_ETHERNET_SPI_CLOCK_MHZ=20 diff --git a/examples/ethernet/iperf/sdkconfig.ci.worst_case_perf_w5500_c2 b/examples/ethernet/iperf/sdkconfig.ci.worst_case_perf_w5500_c2 index 189d986c41..bf045ebcb3 100644 --- a/examples/ethernet/iperf/sdkconfig.ci.worst_case_perf_w5500_c2 +++ b/examples/ethernet/iperf/sdkconfig.ci.worst_case_perf_w5500_c2 @@ -39,6 +39,6 @@ CONFIG_ETH_IRAM_OPTIMIZATION=n # Config Ethernet Init and Choose w5500 CONFIG_ETHERNET_SPI_SUPPORT=y CONFIG_ETHERNET_INTERNAL_SUPPORT=n -CONFIG_ETHERNET_SPI_NUMBER=1 CONFIG_ETHERNET_SPI_DEV0_W5500=y +CONFIG_ETHERNET_SPI_DEV1_NONE=y CONFIG_ETHERNET_SPI_CLOCK_MHZ=20 diff --git a/examples/ethernet/ptp/main/idf_component.yml b/examples/ethernet/ptp/main/idf_component.yml index 2b4dc03286..873794e76c 100644 --- a/examples/ethernet/ptp/main/idf_component.yml +++ b/examples/ethernet/ptp/main/idf_component.yml @@ -1,6 +1,6 @@ dependencies: espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" esp_eth_time: path: ${IDF_PATH}/examples/ethernet/ptp/components/esp_eth_time ptpd: diff --git a/examples/network/bridge/main/idf_component.yml b/examples/network/bridge/main/idf_component.yml index 3c67d52dc7..2cfdfc7b87 100644 --- a/examples/network/bridge/main/idf_component.yml +++ b/examples/network/bridge/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" diff --git a/examples/network/bridge/sdkconfig.ci.w5500 b/examples/network/bridge/sdkconfig.ci.w5500 index f7abfeeabb..590b991997 100644 --- a/examples/network/bridge/sdkconfig.ci.w5500 +++ b/examples/network/bridge/sdkconfig.ci.w5500 @@ -10,9 +10,6 @@ CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=1 # Configure network interface # CONFIG_ETHERNET_INTERNAL_SUPPORT is not set CONFIG_ETHERNET_SPI_SUPPORT=y -CONFIG_ETHERNET_SPI_NUMBER=2 -# CONFIG_ETHERNET_SPI_DEV0_DM9051 is not set -# CONFIG_ETHERNET_SPI_DEV0_KSZ8851SNL is not set CONFIG_ETHERNET_SPI_DEV0_W5500=y CONFIG_ETHERNET_SPI_DEV1_W5500=y CONFIG_ETHERNET_SPI_HOST=1 diff --git a/examples/network/eth2ap/main/idf_component.yml b/examples/network/eth2ap/main/idf_component.yml index 3c67d52dc7..2cfdfc7b87 100644 --- a/examples/network/eth2ap/main/idf_component.yml +++ b/examples/network/eth2ap/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" diff --git a/examples/network/simple_sniffer/main/idf_component.yml b/examples/network/simple_sniffer/main/idf_component.yml index 7a87734e83..ab4cd6fd06 100644 --- a/examples/network/simple_sniffer/main/idf_component.yml +++ b/examples/network/simple_sniffer/main/idf_component.yml @@ -1,4 +1,4 @@ dependencies: pcap: "^1.0.0" espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" diff --git a/examples/network/sta2eth/main/idf_component.yml b/examples/network/sta2eth/main/idf_component.yml index 6702a51f32..a6248b277d 100644 --- a/examples/network/sta2eth/main/idf_component.yml +++ b/examples/network/sta2eth/main/idf_component.yml @@ -8,6 +8,6 @@ dependencies: dns_server: path: ${IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" espressif/network_provisioning: version: "^1.0.5" diff --git a/examples/network/sta2eth/sdkconfig.defaults.esp32c6 b/examples/network/sta2eth/sdkconfig.defaults.esp32c6 new file mode 100644 index 0000000000..1b4441d4f0 --- /dev/null +++ b/examples/network/sta2eth/sdkconfig.defaults.esp32c6 @@ -0,0 +1,3 @@ +CONFIG_EXAMPLE_WIRED_INTERFACE_IS_ETHERNET=y + +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/network/sta2eth/sdkconfig.defaults.esp32c61 b/examples/network/sta2eth/sdkconfig.defaults.esp32c61 new file mode 100644 index 0000000000..1b4441d4f0 --- /dev/null +++ b/examples/network/sta2eth/sdkconfig.defaults.esp32c61 @@ -0,0 +1,3 @@ +CONFIG_EXAMPLE_WIRED_INTERFACE_IS_ETHERNET=y + +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/network/vlan_support/main/idf_component.yml b/examples/network/vlan_support/main/idf_component.yml index 3c67d52dc7..2cfdfc7b87 100644 --- a/examples/network/vlan_support/main/idf_component.yml +++ b/examples/network/vlan_support/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml index 99ed89538b..17deae4379 100644 --- a/examples/peripherals/.build-test-rules.yml +++ b/examples/peripherals/.build-test-rules.yml @@ -116,6 +116,7 @@ examples/peripherals/i2c/i2c_slave_network_sensor: - if: SOC_I2C_SLAVE_CAN_GET_STRETCH_CAUSE != 1 or (SOC_WIFI_SUPPORTED != 1 and SOC_EMAC_SUPPORTED != 1) depends_components: - esp_driver_i2c + - protocol_examples_common examples/peripherals/i2c/i2c_tools: disable: @@ -358,6 +359,7 @@ examples/peripherals/parlio/parlio_rx: - if: SOC_PARLIO_SUPPORTED != 1 depends_components: - esp_driver_parlio + - protocol_examples_common examples/peripherals/parlio/parlio_tx/advanced_rgb_led_matrix: disable: diff --git a/examples/protocols/esp_http_client/sdkconfig.ci b/examples/protocols/esp_http_client/sdkconfig.ci index ec5d34b836..01c12a7093 100644 --- a/examples/protocols/esp_http_client/sdkconfig.ci +++ b/examples/protocols/esp_http_client/sdkconfig.ci @@ -1,11 +1,11 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y diff --git a/examples/protocols/esp_http_client/sdkconfig.ci.ssldyn b/examples/protocols/esp_http_client/sdkconfig.ci.ssldyn index 83de4f6f35..09b7458484 100644 --- a/examples/protocols/esp_http_client/sdkconfig.ci.ssldyn +++ b/examples/protocols/esp_http_client/sdkconfig.ci.ssldyn @@ -1,11 +1,11 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_MBEDTLS_DYNAMIC_BUFFER=y diff --git a/examples/protocols/esp_http_client/sdkconfig.ci.tls13_only b/examples/protocols/esp_http_client/sdkconfig.ci.tls13_only index c2feda087c..a3dff41524 100644 --- a/examples/protocols/esp_http_client/sdkconfig.ci.tls13_only +++ b/examples/protocols/esp_http_client/sdkconfig.ci.tls13_only @@ -1,11 +1,11 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y diff --git a/examples/protocols/http_request/sdkconfig.ci b/examples/protocols/http_request/sdkconfig.ci index f7f2b1c4ec..c29207954a 100644 --- a/examples/protocols/http_request/sdkconfig.ci +++ b/examples/protocols/http_request/sdkconfig.ci @@ -1,9 +1,9 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y diff --git a/examples/protocols/https_mbedtls/sdkconfig.ci b/examples/protocols/https_mbedtls/sdkconfig.ci index f5d403d04c..777a8c498a 100644 --- a/examples/protocols/https_mbedtls/sdkconfig.ci +++ b/examples/protocols/https_mbedtls/sdkconfig.ci @@ -2,11 +2,11 @@ CONFIG_SPIRAM=y CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_MBEDTLS_DYNAMIC_BUFFER=y diff --git a/examples/protocols/https_request/sdkconfig.ci b/examples/protocols/https_request/sdkconfig.ci index d14941adbb..6437388dff 100644 --- a/examples/protocols/https_request/sdkconfig.ci +++ b/examples/protocols/https_request/sdkconfig.ci @@ -2,12 +2,12 @@ CONFIG_SPIRAM=y CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS=y CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEPRECATED_LIST=y diff --git a/examples/protocols/https_request/sdkconfig.ci.cli_ses_tkt b/examples/protocols/https_request/sdkconfig.ci.cli_ses_tkt index 5ed969fa4c..5eb70c6215 100644 --- a/examples/protocols/https_request/sdkconfig.ci.cli_ses_tkt +++ b/examples/protocols/https_request/sdkconfig.ci.cli_ses_tkt @@ -1,11 +1,11 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_EXAMPLE_CLIENT_SESSION_TICKETS=y CONFIG_EXAMPLE_LOCAL_SERVER_URL="FROM_STDIN" diff --git a/examples/protocols/https_request/sdkconfig.ci.ssldyn b/examples/protocols/https_request/sdkconfig.ci.ssldyn index a4763e2c58..4644cd34c3 100644 --- a/examples/protocols/https_request/sdkconfig.ci.ssldyn +++ b/examples/protocols/https_request/sdkconfig.ci.ssldyn @@ -2,12 +2,12 @@ CONFIG_SPIRAM=y CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y diff --git a/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3 b/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3 index adb72fcdfb..828148a685 100644 --- a/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3 +++ b/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3 @@ -2,12 +2,12 @@ CONFIG_SPIRAM=y CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_EXAMPLE_SSL_PROTO_TLS1_3_CLIENT=y CONFIG_EXAMPLE_CLIENT_SESSION_TICKETS=y diff --git a/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3_only b/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3_only index 226b36b101..f9c6ccb2b3 100644 --- a/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3_only +++ b/examples/protocols/https_request/sdkconfig.ci.ssldyn_tls1_3_only @@ -2,12 +2,12 @@ CONFIG_SPIRAM=y CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_EXAMPLE_SSL_PROTO_TLS1_3_CLIENT=y CONFIG_EXAMPLE_CLIENT_SESSION_TICKETS=y diff --git a/examples/protocols/https_x509_bundle/sdkconfig.ci b/examples/protocols/https_x509_bundle/sdkconfig.ci index 701434119b..fe13112ec4 100644 --- a/examples/protocols/https_x509_bundle/sdkconfig.ci +++ b/examples/protocols/https_x509_bundle/sdkconfig.ci @@ -4,9 +4,9 @@ CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certs" CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 diff --git a/examples/protocols/https_x509_bundle/sdkconfig.ci.default_crt_bundle b/examples/protocols/https_x509_bundle/sdkconfig.ci.default_crt_bundle index 59a0ecd5c5..0833c778ad 100644 --- a/examples/protocols/https_x509_bundle/sdkconfig.ci.default_crt_bundle +++ b/examples/protocols/https_x509_bundle/sdkconfig.ci.default_crt_bundle @@ -4,6 +4,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y # QEMU-Related configurations CONFIG_EXAMPLE_CONNECT_ETHERNET=y -CONFIG_EXAMPLE_USE_OPENETH=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_ETH_USE_SPI_ETHERNET=n +CONFIG_ETHERNET_OPENETH_SUPPORT=y +CONFIG_ETHERNET_INTERNAL_SUPPORT=n +CONFIG_ETHERNET_SPI_SUPPORT=n diff --git a/examples/protocols/https_x509_bundle/sdkconfig.ci.ssldyn b/examples/protocols/https_x509_bundle/sdkconfig.ci.ssldyn index c449c1f522..5f71056981 100644 --- a/examples/protocols/https_x509_bundle/sdkconfig.ci.ssldyn +++ b/examples/protocols/https_x509_bundle/sdkconfig.ci.ssldyn @@ -6,9 +6,9 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 diff --git a/examples/protocols/l2tap/main/l2tap_main.c b/examples/protocols/l2tap/main/l2tap_main.c index f22470109c..26bc55edd9 100644 --- a/examples/protocols/l2tap/main/l2tap_main.c +++ b/examples/protocols/l2tap/main/l2tap_main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -41,7 +41,6 @@ typedef struct { static const char *TAG = "l2tap_example"; - /** Opens and configures L2 TAP file descriptor */ static int init_l2tap_fd(int flags, uint16_t eth_type_filter) { @@ -80,6 +79,16 @@ static int init_l2tap_fd(int flags, uint16_t eth_type_filter) } ESP_LOGI(TAG, "L2 TAP fd %d Ethernet type filter configured to 0x%x", fd, eth_type_filter); + esp_eth_handle_t eth_hndl; + if (ioctl(fd, L2TAP_G_DEVICE_DRV_HNDL, ð_hndl) < 0) { + ESP_LOGE(TAG, "failed to get socket eth_handle %d\n", errno); + goto error; + } + uint8_t mac_addr[ETH_ADDR_LEN]; + esp_eth_ioctl(eth_hndl, ETH_CMD_G_MAC_ADDR, mac_addr); + ESP_LOGI(TAG, "fd %d Ethernet HW Addr %02x:%02x:%02x:%02x:%02x:%02x", fd, + mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]); + return fd; error: if (fd != INVALID_FD) { @@ -89,13 +98,10 @@ error: } /** Creates "echo" message from received frame */ -static void create_echo_frame(test_vfs_eth_tap_msg_t *in_frame, test_vfs_eth_tap_msg_t *out_frame, int len) +static void create_echo_frame(uint8_t *our_mac_addr, test_vfs_eth_tap_msg_t *in_frame, test_vfs_eth_tap_msg_t *out_frame, int len) { // Set source address equal to our MAC address - esp_eth_handle_t eth_hndl = get_example_eth_handle(); - uint8_t mac_addr[ETH_ADDR_LEN]; - esp_eth_ioctl(eth_hndl, ETH_CMD_G_MAC_ADDR, mac_addr); - memcpy(out_frame->header.src.addr, mac_addr, ETH_ADDR_LEN); + memcpy(out_frame->header.src.addr, our_mac_addr, ETH_ADDR_LEN); // Set destination address equal to source address from where the frame was received memcpy(out_frame->header.dest.addr, in_frame->header.src.addr, ETH_ADDR_LEN); // Set Ethernet type @@ -115,16 +121,24 @@ static void echo_l2tap_task(void *pvParameters) goto error; } + esp_eth_handle_t eth_hndl; + if (ioctl(eth_tap_fd, L2TAP_G_DEVICE_DRV_HNDL, ð_hndl) < 0) { + ESP_LOGE(TAG, "failed to get socket eth_handle %d\n", errno); + goto error; + } + uint8_t local_mac_addr[ETH_ADDR_LEN]; + esp_eth_ioctl(eth_hndl, ETH_CMD_G_MAC_ADDR, local_mac_addr); + while (1) { ssize_t len = read(eth_tap_fd, rx_buffer, sizeof(rx_buffer)); if (len > 0) { test_vfs_eth_tap_msg_t *recv_msg = (test_vfs_eth_tap_msg_t *)rx_buffer; ESP_LOGI(TAG, "fd %d received %d bytes from %.2x:%.2x:%.2x:%.2x:%.2x:%.2x", eth_tap_fd, - len, recv_msg->header.src.addr[0], recv_msg->header.src.addr[1], recv_msg->header.src.addr[2], - recv_msg->header.src.addr[3], recv_msg->header.src.addr[4], recv_msg->header.src.addr[5]); + len, recv_msg->header.src.addr[0], recv_msg->header.src.addr[1], recv_msg->header.src.addr[2], + recv_msg->header.src.addr[3], recv_msg->header.src.addr[4], recv_msg->header.src.addr[5]); // Construct echo frame test_vfs_eth_tap_msg_t echo_msg; - create_echo_frame(recv_msg, &echo_msg, len); + create_echo_frame(local_mac_addr, recv_msg, &echo_msg, len); // Send the echo message ssize_t ret = write(eth_tap_fd, &echo_msg, len); @@ -153,6 +167,14 @@ static void nonblock_l2tap_echo_task(void *pvParameters) goto error; } + esp_eth_handle_t eth_hndl; + if (ioctl(eth_tap_fd, L2TAP_G_DEVICE_DRV_HNDL, ð_hndl) < 0) { + ESP_LOGE(TAG, "failed to get socket eth_handle %d\n", errno); + goto error; + } + uint8_t local_mac_addr[ETH_ADDR_LEN]; + esp_eth_ioctl(eth_hndl, ETH_CMD_G_MAC_ADDR, local_mac_addr); + while (1) { struct timeval tv; tv.tv_sec = 5; @@ -168,11 +190,11 @@ static void nonblock_l2tap_echo_task(void *pvParameters) if (len > 0) { test_vfs_eth_tap_msg_t *recv_msg = (test_vfs_eth_tap_msg_t *)rx_buffer; ESP_LOGI(TAG, "fd %d received %d bytes from %.2x:%.2x:%.2x:%.2x:%.2x:%.2x", eth_tap_fd, - len, recv_msg->header.src.addr[0], recv_msg->header.src.addr[1], recv_msg->header.src.addr[2], - recv_msg->header.src.addr[3], recv_msg->header.src.addr[4], recv_msg->header.src.addr[5]); + len, recv_msg->header.src.addr[0], recv_msg->header.src.addr[1], recv_msg->header.src.addr[2], + recv_msg->header.src.addr[3], recv_msg->header.src.addr[4], recv_msg->header.src.addr[5]); // Construct echo frame test_vfs_eth_tap_msg_t echo_msg; - create_echo_frame(recv_msg, &echo_msg, len); + create_echo_frame(local_mac_addr, recv_msg, &echo_msg, len); // Send the echo message ssize_t ret = write(eth_tap_fd, &echo_msg, len); @@ -216,7 +238,12 @@ static void hello_tx_l2tap_task(void *pvParameters) }, .payload = "ESP32 hello to everybody!" }; - esp_eth_handle_t eth_hndl = get_example_eth_handle(); + + esp_eth_handle_t eth_hndl; + if (ioctl(eth_tap_fd, L2TAP_G_DEVICE_DRV_HNDL, ð_hndl) < 0) { + ESP_LOGE(TAG, "failed to get socket eth_handle %d\n", errno); + goto error; + } esp_eth_ioctl(eth_hndl, ETH_CMD_G_MAC_ADDR, hello_msg.header.src.addr); while (1) { @@ -250,12 +277,6 @@ void app_main(void) */ ESP_ERROR_CHECK(example_connect()); - esp_eth_handle_t eth_hndl = get_example_eth_handle(); - uint8_t mac_addr[ETH_ADDR_LEN]; - esp_eth_ioctl(eth_hndl, ETH_CMD_G_MAC_ADDR, mac_addr); - ESP_LOGI(TAG, "Ethernet HW Addr %02x:%02x:%02x:%02x:%02x:%02x", - mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]); - // Echo received message back to sender (blocks indefinitely) xTaskCreate(echo_l2tap_task, "echo", 4096, NULL, 6, NULL); // Echo received message back to sender (blocks with timeout) diff --git a/examples/protocols/l2tap/pytest_example_l2tap_echo.py b/examples/protocols/l2tap/pytest_example_l2tap_echo.py index 3defccbbed..eca3057aa3 100644 --- a/examples/protocols/l2tap/pytest_example_l2tap_echo.py +++ b/examples/protocols/l2tap/pytest_example_l2tap_echo.py @@ -5,7 +5,7 @@ import logging import os import socket import sys -from typing import Iterator +from collections.abc import Iterator import pytest from pytest_embedded import Dut @@ -103,7 +103,7 @@ def actual_test(dut: Dut) -> None: @pytest.mark.eth_ip101 -@pytest.mark.flaky(reruns=3, reruns_delay=5) +@pytest.mark.flaky(reruns=1, reruns_delay=5) @idf_parametrize('target', ['esp32'], indirect=['target']) def test_esp_netif_l2tap_example(dut: Dut) -> None: actual_test(dut) diff --git a/examples/protocols/l2tap/sdkconfig.defaults b/examples/protocols/l2tap/sdkconfig.defaults index ecb9af6bd1..645412a0c2 100644 --- a/examples/protocols/l2tap/sdkconfig.defaults +++ b/examples/protocols/l2tap/sdkconfig.defaults @@ -1,5 +1,12 @@ # L2 TAP currently supports Ethernet only CONFIG_EXAMPLE_CONNECT_ETHERNET=y +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 +CONFIG_ETHERNET_SPI_SUPPORT=n CONFIG_EXAMPLE_CONNECT_WIFI=n # Enable L2 TAP diff --git a/examples/protocols/mqtt/sdkconfig.ci b/examples/protocols/mqtt/sdkconfig.ci index d8a42deaa5..c9d20322b0 100644 --- a/examples/protocols/mqtt/sdkconfig.ci +++ b/examples/protocols/mqtt/sdkconfig.ci @@ -1,11 +1,11 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_LWIP_CHECK_THREAD_SAFETY=y diff --git a/examples/protocols/mqtt5/sdkconfig.ci b/examples/protocols/mqtt5/sdkconfig.ci index a7efa857a6..72e1c46071 100644 --- a/examples/protocols/mqtt5/sdkconfig.ci +++ b/examples/protocols/mqtt5/sdkconfig.ci @@ -1,11 +1,11 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MQTT_PROTOCOL_5=y CONFIG_EXAMPLE_MQTT_BROKER_URI="mqtts://${EXAMPLE_MQTT_BROKER_SSL}" CONFIG_EXAMPLE_BROKER_CERTIFICATE_OVERRIDE="${EXAMPLE_MQTT_BROKER_CERTIFICATE}" diff --git a/examples/protocols/sockets/non_blocking/sdkconfig.ci b/examples/protocols/sockets/non_blocking/sdkconfig.ci index 96fbdfaba5..50c85de4bc 100644 --- a/examples/protocols/sockets/non_blocking/sdkconfig.ci +++ b/examples/protocols/sockets/non_blocking/sdkconfig.ci @@ -1,5 +1,5 @@ +CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_TCP_SERVER=y CONFIG_EXAMPLE_TCP_CLIENT_CONNECT_ADDRESS="localhost" CONFIG_EXAMPLE_TCP_CLIENT_CONNECT_PORT="3344" diff --git a/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default b/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default index e18397f4d0..200c2a3de4 100644 --- a/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default +++ b/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default @@ -6,9 +6,9 @@ CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 diff --git a/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default_esp32p4 b/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default_esp32p4 index c9bab6f509..07f0b1d50d 100644 --- a/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default_esp32p4 +++ b/examples/protocols/sockets/udp_multicast/sdkconfig.ci.default_esp32p4 @@ -6,9 +6,9 @@ CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=31 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=52 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=51 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 diff --git a/examples/protocols/static_ip/main/idf_component.yml b/examples/protocols/static_ip/main/idf_component.yml index 3c67d52dc7..2cfdfc7b87 100644 --- a/examples/protocols/static_ip/main/idf_component.yml +++ b/examples/protocols/static_ip/main/idf_component.yml @@ -1,3 +1,3 @@ dependencies: espressif/ethernet_init: - version: "1.0.0" + version: "~1.2.0" diff --git a/examples/security/.build-test-rules.yml b/examples/security/.build-test-rules.yml index 3e688fde83..a21af38465 100644 --- a/examples/security/.build-test-rules.yml +++ b/examples/security/.build-test-rules.yml @@ -60,6 +60,7 @@ examples/security/tee/tee_secure_ota: - if: IDF_TARGET not in ["esp32c6", "esp32c61"] depends_components: - esp_tee + - protocol_examples_common depends_filepatterns: - examples/security/tee/tee_secure_ota/**/* diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index 4798376b5e..9c5cd9fa73 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -210,6 +210,7 @@ examples/system/ota/partitions_ota: - esp_wifi - esp_phy - mbedtls + - protocol_examples_common examples/system/ota/simple_ota_example: disable: @@ -230,6 +231,7 @@ examples/system/ota/simple_ota_example: - esp_wifi - esp_phy - mbedtls + - protocol_examples_common examples/system/perfmon: enable: diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci b/examples/system/ota/advanced_https_ota/sdkconfig.ci index 1081c3e552..eed0c8f8aa 100644 --- a/examples/system/ota/advanced_https_ota/sdkconfig.ci +++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci @@ -5,12 +5,12 @@ CONFIG_EXAMPLE_OTA_RECV_TIMEOUT=3000 CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.anti_rollback b/examples/system/ota/advanced_https_ota/sdkconfig.ci.anti_rollback index 79f1274617..278a31918d 100644 --- a/examples/system/ota/advanced_https_ota/sdkconfig.ci.anti_rollback +++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci.anti_rollback @@ -13,12 +13,12 @@ CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y CONFIG_BOOTLOADER_APP_SECURE_VERSION=1 CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption b/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption index b2ad2cbe91..eafdbad9be 100644 --- a/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption +++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption @@ -6,14 +6,14 @@ CONFIG_EXAMPLE_ENABLE_OTA_RESUMPTION=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y -CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=3072 +CONFIG_ETHERNET_RX_TASK_STACK_SIZE=3072 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption_partial_download b/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption_partial_download index d921caab4a..e386fcb25b 100644 --- a/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption_partial_download +++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci.ota_resumption_partial_download @@ -8,14 +8,14 @@ CONFIG_EXAMPLE_ENABLE_OTA_RESUMPTION=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y -CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=3072 +CONFIG_ETHERNET_RX_TASK_STACK_SIZE=3072 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.partial_download b/examples/system/ota/advanced_https_ota/sdkconfig.ci.partial_download index 929e6cd758..b8b40ce3ee 100644 --- a/examples/system/ota/advanced_https_ota/sdkconfig.ci.partial_download +++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci.partial_download @@ -9,11 +9,11 @@ CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y -CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=3072 +CONFIG_ETHERNET_RX_TASK_STACK_SIZE=3072 diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.verify_revision_esp32c3 b/examples/system/ota/advanced_https_ota/sdkconfig.ci.verify_revision_esp32c3 index 0dd6afaa55..aa7f989c5d 100644 --- a/examples/system/ota/advanced_https_ota/sdkconfig.ci.verify_revision_esp32c3 +++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci.verify_revision_esp32c3 @@ -7,6 +7,7 @@ CONFIG_EXAMPLE_OTA_RECV_TIMEOUT=3000 # QEMU-Related configurations CONFIG_EXAMPLE_CONNECT_ETHERNET=y -CONFIG_EXAMPLE_USE_OPENETH=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_ETH_USE_SPI_ETHERNET=n +CONFIG_ETHERNET_OPENETH_SUPPORT=y +CONFIG_ETHERNET_INTERNAL_SUPPORT=n +CONFIG_ETHERNET_SPI_SUPPORT=n diff --git a/examples/system/ota/native_ota_example/sdkconfig.ci b/examples/system/ota/native_ota_example/sdkconfig.ci index cffef6ccd0..18e0978382 100644 --- a/examples/system/ota/native_ota_example/sdkconfig.ci +++ b/examples/system/ota/native_ota_example/sdkconfig.ci @@ -5,12 +5,12 @@ CONFIG_EXAMPLE_OTA_RECV_TIMEOUT=3000 CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.flash_enc_wifi b/examples/system/ota/simple_ota_example/sdkconfig.ci.flash_enc_wifi index 71026b08d2..04f996a8da 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.flash_enc_wifi +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.flash_enc_wifi @@ -10,8 +10,8 @@ CONFIG_SECURE_FLASH_UART_BOOTLOADER_ALLOW_CACHE=y CONFIG_SECURE_FLASH_REQUIRE_ALREADY_ENABLED=y CONFIG_NVS_SEC_KEY_PROTECT_USING_FLASH_ENC=y CONFIG_PARTITION_TABLE_OFFSET=0x9000 -CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_CONNECT_WIFI=y +CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_WIFI_SSID_PWD_FROM_STDIN=y # This is required for nvs encryption (which is enabled by default with flash encryption) CONFIG_PARTITION_TABLE_TWO_OTA_ENCRYPTED_NVS=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_ecdsa b/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_ecdsa index 5fab05ac03..9f199bc0d9 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_ecdsa +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_ecdsa @@ -13,10 +13,10 @@ CONFIG_SECURE_BOOT_SIGNING_KEY="test/secure_boot_signing_key_ecdsa.pem" CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa b/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa index 55659b67dc..63b6f27943 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa @@ -15,12 +15,12 @@ CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram b/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram index dafc49b357..f7c0f5e93f 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.spiram @@ -4,10 +4,10 @@ CONFIG_SPIRAM=y CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_2_dynamic b/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_2_dynamic index fc10fc4b6e..68c21cf150 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_2_dynamic +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_2_dynamic @@ -2,12 +2,12 @@ CONFIG_EXAMPLE_FIRMWARE_UPGRADE_URL="FROM_STDIN" CONFIG_EXAMPLE_SKIP_COMMON_NAME_CHECK=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3 b/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3 index 0b61802fdc..26ef5ec177 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3 +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3 @@ -2,11 +2,11 @@ CONFIG_EXAMPLE_FIRMWARE_UPGRADE_URL="FROM_STDIN" CONFIG_EXAMPLE_SKIP_COMMON_NAME_CHECK=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y diff --git a/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3_only_dynamic b/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3_only_dynamic index 2ce36f9bd2..853fa6afbe 100644 --- a/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3_only_dynamic +++ b/examples/system/ota/simple_ota_example/sdkconfig.ci.tls1_3_only_dynamic @@ -2,12 +2,12 @@ CONFIG_EXAMPLE_FIRMWARE_UPGRADE_URL="FROM_STDIN" CONFIG_EXAMPLE_SKIP_COMMON_NAME_CHECK=y CONFIG_EXAMPLE_CONNECT_ETHERNET=y CONFIG_EXAMPLE_CONNECT_WIFI=n -CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y -CONFIG_EXAMPLE_ETH_PHY_GENERIC=y -CONFIG_EXAMPLE_ETH_MDC_GPIO=23 -CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 -CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 -CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_ETHERNET_INTERNAL_SUPPORT=y +CONFIG_ETHERNET_PHY_GENERIC=y +CONFIG_ETHERNET_MDC_GPIO=23 +CONFIG_ETHERNET_MDIO_GPIO=18 +CONFIG_ETHERNET_PHY_RST_GPIO=5 +CONFIG_ETHERNET_PHY_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y CONFIG_MBEDTLS_DYNAMIC_BUFFER=y diff --git a/examples/zigbee/.build-test-rules.yml b/examples/zigbee/.build-test-rules.yml index 88146d0eed..063552f302 100644 --- a/examples/zigbee/.build-test-rules.yml +++ b/examples/zigbee/.build-test-rules.yml @@ -4,6 +4,7 @@ depends_components: - ieee802154 - openthread + - protocol_examples_common depends_filepatterns: - examples/zigbee/light_sample/**/* diff --git a/tools/ci/ignore_build_warnings.txt b/tools/ci/ignore_build_warnings.txt index dddea3463f..0b77e1a5f2 100644 --- a/tools/ci/ignore_build_warnings.txt +++ b/tools/ci/ignore_build_warnings.txt @@ -39,3 +39,10 @@ warning: unknown kconfig symbol 'UNITY_FREERTOS_STACK_SIZE' assigned to '12288' warning: unknown kconfig symbol 'WPA3_SAE' assigned to 'y' in .*/components/wpa_supplicant/test_apps/sdkconfig.defaults ld: warning: ignoring duplicate libraries archive library: .+ the table of contents is empty +WARNING: The following Kconfig variables were used in "if" clauses +warning: unknown kconfig symbol 'ETHERNET_INTERNAL_SUPPORT' assigned to 'y' in .*/examples/protocols/esp_http_client/sdkconfig.ci.* +warning: unknown kconfig symbol 'ETHERNET_PHY_GENERIC' assigned to 'y' in .*/examples/protocols/esp_http_client/sdkconfig.ci.* +warning: unknown kconfig symbol 'ETHERNET_MDC_GPIO' assigned to '23' in .*/examples/protocols/esp_http_client/sdkconfig.ci.* +warning: unknown kconfig symbol 'ETHERNET_MDIO_GPIO' assigned to '18' in .*/examples/protocols/esp_http_client/sdkconfig.ci.* +warning: unknown kconfig symbol 'ETHERNET_PHY_RST_GPIO' assigned to '5' in .*/examples/protocols/esp_http_client/sdkconfig.ci.* +warning: unknown kconfig symbol 'ETHERNET_PHY_ADDR' assigned to '1' in .*/examples/protocols/esp_http_client/sdkconfig.ci.*