Merge branch 'esp32h2_support_spi_ethernet' into 'master'

Update default pins for Basic and ENC28J60 Ethernet examples

See merge request espressif/esp-idf!23241

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

@@ -1,23 +1,13 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
-examples/ethernet/enc28j60:
-  disable:
-    - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" #Depends on IDF-6245
-      temporary: true
-      reason: target esp32c6, esp32h2 is not supported yet
-
 examples/ethernet/eth2ap:
   disable:
-    - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2"
+    - if: IDF_TARGET == "esp32h2"
       temporary: true
-      reason: target esp32c6, esp32h2 is not supported yet
+      reason: esp32h2 is not supported
 
 examples/ethernet/iperf:
-  disable:
-    - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2"
-      temporary: true
-      reason: target esp32c6 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32c3", "esp32c2", "esp32s2", "esp32s3"]
+    - if: IDF_TARGET not in ["esp32"]
       temporary: true
       reason: lack of runners

examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild

@@ -141,7 +141,7 @@ menu "Example Ethernet Configuration"
             range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
             default 14 if IDF_TARGET_ESP32
             default 12 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-            default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+            default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
             default 4 if IDF_TARGET_ESP32H2
             help
                 Set the GPIO number used by SPI SCLK.
@@ -151,7 +151,7 @@ menu "Example Ethernet Configuration"
             range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
             default 13 if IDF_TARGET_ESP32
             default 11 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-            default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+            default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
             default 5 if IDF_TARGET_ESP32H2
             help
                 Set the GPIO number used by SPI MOSI.
@@ -161,7 +161,7 @@ menu "Example Ethernet Configuration"
             range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
             default 12 if IDF_TARGET_ESP32
             default 13 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-            default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+            default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
             default 0 if IDF_TARGET_ESP32H2
             help
                 Set the GPIO number used by SPI MISO.
@@ -169,8 +169,7 @@ menu "Example Ethernet Configuration"
         config EXAMPLE_ETH_SPI_CLOCK_MHZ
             int "SPI clock speed (MHz)"
             range 5 80
-            default 12 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2
-            default 36 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 16
             help
                 Set the clock speed (MHz) of SPI interface.
 
@@ -179,6 +178,7 @@ menu "Example Ethernet Configuration"
             range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
             default 15 if IDF_TARGET_ESP32
             default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2
+            default 3 if IDF_TARGET_ESP32C6
             default 1 if IDF_TARGET_ESP32H2
             help
                 Set the GPIO number used by SPI CS0, i.e. Chip Select associated with the first SPI Eth module).
@@ -190,6 +190,7 @@ menu "Example Ethernet Configuration"
             default 32 if IDF_TARGET_ESP32
             default 7 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
             default 8 if IDF_TARGET_ESP32C3
+            default 21 if IDF_TARGET_ESP32C6
             default 3 if IDF_TARGET_ESP32C2
             default 11 if IDF_TARGET_ESP32H2
             help
@@ -199,8 +200,8 @@ menu "Example Ethernet Configuration"
             int "Interrupt GPIO number SPI Ethernet module #1"
             range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
             default 4 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
-            default 4 if IDF_TARGET_ESP32C2
-            default 9 if IDF_TARGET_ESP32H2
+            default 4 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
+            default 10 if IDF_TARGET_ESP32H2
             help
                 Set the GPIO number used by the first SPI Ethernet module interrupt line.
 
@@ -210,7 +211,8 @@ menu "Example Ethernet Configuration"
             range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
             default 33 if IDF_TARGET_ESP32
             default 5 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2
-            default 10 if IDF_TARGET_ESP32H2
+            default 5 if IDF_TARGET_ESP32C6
+            default 9 if IDF_TARGET_ESP32H2
             help
                 Set the GPIO number used by the second SPI Ethernet module interrupt line.
 

examples/ethernet/enc28j60/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # ENC28J60 Example
 (See the README.md file in the upper level 'examples' directory for more information about examples.)

examples/ethernet/enc28j60/main/Kconfig.projbuild

@@ -14,7 +14,7 @@ menu "Example Configuration"
         range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
         default 14 if IDF_TARGET_ESP32
         default 12 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-        default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
         default 4 if IDF_TARGET_ESP32H2
         help
             Set the GPIO number used by SPI SCLK.
@@ -24,7 +24,7 @@ menu "Example Configuration"
         range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
         default 13 if IDF_TARGET_ESP32
         default 11 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-        default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
         default 5 if IDF_TARGET_ESP32H2
         help
             Set the GPIO number used by SPI MOSI.
@@ -34,7 +34,7 @@ menu "Example Configuration"
         range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
         default 12 if IDF_TARGET_ESP32
         default 13 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
-        default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
         default 0 if IDF_TARGET_ESP32H2
         help
             Set the GPIO number used by SPI MISO.
@@ -44,6 +44,7 @@ menu "Example Configuration"
         range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
         default 15 if IDF_TARGET_ESP32
         default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2
+        default 3 if IDF_TARGET_ESP32C6
         default 1 if IDF_TARGET_ESP32H2
         help
             Set the GPIO number used by SPI CS.
@@ -59,8 +60,8 @@ menu "Example Configuration"
         int "Interrupt GPIO number"
         range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
         default 4 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
-        default 4 if IDF_TARGET_ESP32C2
-        default 9 if IDF_TARGET_ESP32H2
+        default 4 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
+        default 10 if IDF_TARGET_ESP32H2
         help
             Set the GPIO number used by ENC28J60 interrupt.
 

examples/ethernet/eth2ap/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # eth2ap Example
 (See the README.md file in the upper level 'examples' directory for more information about examples. To try a more complex application about Ethernet to WiFi data forwarding, please go to [iot-solution](https://github.com/espressif/esp-iot-solution/tree/release/v1.0/examples/eth2wifi).)

examples/ethernet/iperf/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Ethernet iperf Example
 

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

@@ -1,9 +1,5 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
-examples/network:
-  disable:
-    - if: IDF_TARGET in ["esp32h2"]
-
 examples/network/bridge:
   disable_test:
     - if: IDF_TARGET != "esp32"

examples/network/network_tests/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Intel net test suite for LwIP network stack
 

examples/network/vlan_support/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Ethernet VLAN Support Example