Merge branch 'feat/spi_eth_c61' into 'master'

feat(esp_eth): added SPI ETH defaults for C61 in examples Closes IDF-9298 See merge request espressif/esp-idf!33559
espressif · Sep 24, 2024 · 2653ed5 · 2653ed5
2 parents 9bbc61e + 301e671
commit 2653ed5
Show file tree

Hide file tree

Showing 50 changed files with 107 additions and 195 deletions.
diff --git a/examples/common_components/env_caps/esp32c61/Kconfig.env_caps b/examples/common_components/env_caps/esp32c61/Kconfig.env_caps
@@ -4,7 +4,7 @@ config ENV_GPIO_RANGE_MIN
 
 config ENV_GPIO_RANGE_MAX
     int
-    default 21
+    default 24
 
 config ENV_GPIO_IN_RANGE_MAX
     int

diff --git a/examples/ethernet/.build-test-rules.yml b/examples/ethernet/.build-test-rules.yml
@@ -3,10 +3,6 @@
 examples/ethernet/basic:
   enable:
     - if: INCLUDE_DEFAULT == 1
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet # TODO: [esp32c61] IDF-9298
   disable_test:
     - if: IDF_TARGET not in ["esp32"]
       temporary: true
@@ -20,10 +16,6 @@ examples/ethernet/basic:
     - esp_driver_spi
 
 examples/ethernet/enc28j60:
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet # TODO: [esp32c61] IDF-9298
   depends_components:
     - esp_eth
     - esp_netif
@@ -33,10 +25,6 @@ examples/ethernet/enc28j60:
     - esp_driver_spi
 
 examples/ethernet/iperf:
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet # TODO: [esp32c61] IDF-9298
   disable_test:
     - if: IDF_TARGET not in ["esp32"]
       temporary: true

diff --git a/examples/ethernet/basic/README.md b/examples/ethernet/basic/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # Ethernet Example
 (See the README.md file in the upper level 'examples' directory for more information about examples.)

diff --git a/examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild b/examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild
@@ -145,7 +145,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 || IDF_TARGET_ESP32C6
+            default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C61
             default 4 if IDF_TARGET_ESP32H2
             default 33 if IDF_TARGET_ESP32P4
             default 8 if IDF_TARGET_ESP32C5
@@ -157,7 +157,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 || IDF_TARGET_ESP32C6
+            default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C61
             default 5 if IDF_TARGET_ESP32H2
             default 32 if IDF_TARGET_ESP32P4
             default 10 if IDF_TARGET_ESP32C5
@@ -169,7 +169,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 || IDF_TARGET_ESP32C6
+            default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C61
             default 0 if IDF_TARGET_ESP32H2
             default 52 if IDF_TARGET_ESP32P4
             default 9 if IDF_TARGET_ESP32C5
@@ -188,7 +188,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 || IDF_TARGET_ESP32C5
+            default 3 if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5 || IDF_TARGET_ESP32C61
             default 1 if IDF_TARGET_ESP32H2
             default 53 if IDF_TARGET_ESP32P4
             help
@@ -204,7 +204,7 @@ menu "Example Ethernet Configuration"
             default 21 if IDF_TARGET_ESP32C6
             default 3 if IDF_TARGET_ESP32C2
             default 11 if IDF_TARGET_ESP32H2
-            default 23 if IDF_TARGET_ESP32P4
+            default 23 if IDF_TARGET_ESP32P4 || IDF_TARGET_ESP32C61
             default 1 if IDF_TARGET_ESP32C5
             help
                 Set the GPIO number used by SPI CS1, i.e. Chip Select associated with the second SPI Eth module.
@@ -216,6 +216,7 @@ menu "Example Ethernet Configuration"
             default 4 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
             default 10 if IDF_TARGET_ESP32H2
             default 48 if IDF_TARGET_ESP32P4
+            default 0 if IDF_TARGET_ESP32C61
             help
                 Set the GPIO number used by the first SPI Ethernet module interrupt line.
                 Set -1 to use SPI Ethernet module in polling mode.
@@ -229,6 +230,7 @@ menu "Example Ethernet Configuration"
             default 5 if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
             default 9 if IDF_TARGET_ESP32H2
             default 47 if IDF_TARGET_ESP32P4
+            default 1 if IDF_TARGET_ESP32C61
             help
                 Set the GPIO number used by the second SPI Ethernet module interrupt line.
                 Set -1 to use SPI Ethernet module in polling mode.

diff --git a/examples/ethernet/enc28j60/README.md b/examples/ethernet/enc28j60/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # ENC28J60 Example
 (See the README.md file in the upper level 'examples' directory for more information about examples.)

diff --git a/examples/ethernet/iperf/README.md b/examples/ethernet/iperf/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
 
 # Ethernet iperf Example
 

diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml
@@ -14,10 +14,6 @@ examples/protocols/esp_http_client:
   <<: *default_dependencies
   enable:
     - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET not in ["esp32", "linux"]
   depends_filepatterns:
@@ -26,9 +22,9 @@ examples/protocols/esp_http_client:
 examples/protocols/esp_local_ctrl:
   <<: *default_dependencies
   disable:
-    - if: IDF_TARGET in ["esp32h2", "esp32c61"]
+    - if: IDF_TARGET in ["esp32h2"]
       temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
+      reason: not supported yet
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: only test on these targets
@@ -38,20 +34,12 @@ examples/protocols/esp_local_ctrl:
 
 examples/protocols/http_request:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/http_server:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: only test on these targets
@@ -63,9 +51,6 @@ examples/protocols/http_server/captive_portal:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
       reason: WiFi is required
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
@@ -75,18 +60,14 @@ examples/protocols/http_server/captive_portal:
 examples/protocols/http_server/restful_server:
   <<: *default_dependencies
   disable:
-    - if: IDF_TARGET in ["esp32h2", "esp32c61"]
+    - if: IDF_TARGET in ["esp32h2"]
       temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
+      reason: not supported yet
   depends_filepatterns:
     - components/esp_http_server/**/*
 
 examples/protocols/http_server/ws_echo_server:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
@@ -97,30 +78,22 @@ examples/protocols/https_mbedtls:
   <<: *default_dependencies
   enable:
     - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/https_request:
   <<: *default_dependencies
   disable:
-    - if: IDF_TARGET in ["esp32h2", "esp32c61"]
+    - if: IDF_TARGET in ["esp32h2"]
       temporary: true
-      reason: not supported on h2 # TODO: [ESP32C61] IDF-9298
+      reason: not supported on h2
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/https_server/simple:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       reason: only test on these targets
@@ -130,10 +103,6 @@ examples/protocols/https_server/simple:
 
 examples/protocols/https_server/wss_server:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
@@ -142,10 +111,6 @@ examples/protocols/https_server/wss_server:
 
 examples/protocols/https_x509_bundle:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
@@ -159,47 +124,27 @@ examples/protocols/icmp_echo:
 
 examples/protocols/l2tap:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/modbus:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported yet [ESP32C61] IDF-9298
   depends_filepatterns:
     - examples/common_components/protocol_examples_common/**/*
     - examples/protocols/modbus/mb_example_common/**/*
 
 
 examples/protocols/mqtt:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
   depends_filepatterns:
     - components/mqtt/**/*
 
 examples/protocols/mqtt/custom_outbox:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
 
 examples/protocols/mqtt/ssl:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
@@ -213,50 +158,30 @@ examples/protocols/mqtt/ssl_ds:
 
 examples/protocols/mqtt/tcp:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/mqtt/ws:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/mqtt/wss:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/mqtt5:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32
 
 examples/protocols/smtp_client:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61  # TODO: [ESP32C61] IDF-9298
 
 examples/protocols/sntp:
   <<: *default_dependencies
@@ -267,10 +192,6 @@ examples/protocols/sntp:
 
 examples/protocols/sockets:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: SOC_WIFI_SUPPORTED != 1
 
@@ -286,17 +207,9 @@ examples/protocols/sockets/tcp_client:
   disable_test:
     - if: SOC_WIFI_SUPPORTED != 1
   # linux target won't work with CONFIG_EXAMPLE_SOCKET_IP_INPUT_STDIN=y
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61  # TODO: [ESP32C61] IDF-9298
 
 examples/protocols/static_ip:
   <<: *default_dependencies
-  disable:
-    - if: IDF_TARGET in ["esp32c61"]
-      temporary: true
-      reason: not supported on c61  # TODO: [ESP32C61] IDF-9298
   disable_test:
     - if: IDF_TARGET != "esp32"
       temporary: true

diff --git a/examples/protocols/esp_http_client/README.md b/examples/protocols/esp_http_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | Linux |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | ----- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | Linux |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | ----- |
 # ESP HTTP Client Example
 
 See the README.md file in the upper level 'examples' directory for more information about examples.