ESP32: Update esp-idf to v5.1.1 release (#28980)

* ESP32: Update esp-idf to v5.1.1 release * Restyled by prettier-markdown --------- Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Sep 5, 2023 · c8361b5 · c8361b5
1 parent 959ae4e
commit c8361b5
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 20 deletions.
diff --git a/docs/guides/esp32/setup_idf_chip.md b/docs/guides/esp32/setup_idf_chip.md
@@ -16,22 +16,22 @@ step.
 -   [Linux](https://docs.espressif.com/projects/esp-idf/en/v5.1/esp32/get-started/linux-macos-setup.html#for-linux-users)
 -   [macOS](https://docs.espressif.com/projects/esp-idf/en/v5.1/esp32/get-started/linux-macos-setup.html#for-macos-users)
 
-### Get IDF v5.1
+### Get IDF v5.1.1
 
--   Clone ESP-IDF
-    [v5.1 release](https://github.com/espressif/esp-idf/releases/tag/v5.1)
+-   Clone ESP-IDF [v5.1.1
+    release](https://github.com/espressif/esp-idf/releases/tag/v5.1.1
 
     ```
-    git clone -b v5.1 --recursive --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git
+    git clone -b v5.1.1 --recursive --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git
     cd esp-idf
     ./install.sh
     ```
 
--   To update an existing esp-idf toolchain to v5.1:
+-   To update an existing esp-idf toolchain to v5.1.1:
 
     ```
     cd path/to/esp-idf
-    git fetch --depth 1 origin v5.1
+    git fetch --depth 1 origin v5.1.1
     git reset --hard FETCH_HEAD
     git submodule update --depth 1 --recursive --init
 

diff --git a/examples/all-clusters-app/esp32/partitions.csv b/examples/all-clusters-app/esp32/partitions.csv
@@ -5,4 +5,3 @@ otadata,  data, ota,     ,        0x2000,
 phy_init, data, phy,     ,        0x1000,
 ota_0,    app,  ota_0,   ,        1900K,
 ota_1,    app,  ota_1,   ,        1900K,
-ot_storage, data, 0x3a,            , 0x2000,
diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults b/examples/all-clusters-app/esp32/sdkconfig.defaults
@@ -69,3 +69,6 @@ CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 
 # Move functions from IRAM to flash
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/all-clusters-minimal-app/esp32/partitions.csv b/examples/all-clusters-minimal-app/esp32/partitions.csv
@@ -5,4 +5,3 @@ otadata,  data, ota,     ,        0x2000,
 phy_init, data, phy,     ,        0x1000,
 ota_0,    app,  ota_0,   ,        1900K,
 ota_1,    app,  ota_1,   ,        1900K,
-ot_storage, data, 0x3a,            , 0x2000,
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults
@@ -69,3 +69,6 @@ CONFIG_MBEDTLS_HKDF_C=y
 
 # Move functions from IRAM to flash
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/bridge-app/esp32/sdkconfig.defaults b/examples/bridge-app/esp32/sdkconfig.defaults
@@ -48,3 +48,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/chef/esp32/sdkconfig.defaults b/examples/chef/esp32/sdkconfig.defaults
@@ -62,3 +62,6 @@ CONFIG_MBEDTLS_HKDF_C=y
 
 # IRAM optimizations
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/light-switch-app/esp32/sdkconfig.defaults b/examples/light-switch-app/esp32/sdkconfig.defaults
@@ -55,3 +55,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/lighting-app/esp32/partitions_h2.csv b/examples/lighting-app/esp32/partitions_h2.csv
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults b/examples/lighting-app/esp32/sdkconfig.defaults
@@ -61,3 +61,6 @@ CONFIG_MBEDTLS_HKDF_C=y
 
 # Disable Read Client
 CONFIG_DISABLE_READ_CLIENT=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
@@ -38,7 +38,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8

diff --git a/examples/lock-app/esp32/sdkconfig.defaults b/examples/lock-app/esp32/sdkconfig.defaults
@@ -52,3 +52,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/ota-provider-app/esp32/sdkconfig.defaults b/examples/ota-provider-app/esp32/sdkconfig.defaults
@@ -67,3 +67,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/ota-requestor-app/esp32/sdkconfig.defaults b/examples/ota-requestor-app/esp32/sdkconfig.defaults
@@ -68,3 +68,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/pigweed-app/esp32/sdkconfig.defaults b/examples/pigweed-app/esp32/sdkconfig.defaults
@@ -45,3 +45,6 @@ CONFIG_DEVICE_PRODUCT_ID=0x800B
 CONFIG_MBEDTLS_HKDF_C=y
 
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/temperature-measurement-app/esp32/sdkconfig.defaults b/examples/temperature-measurement-app/esp32/sdkconfig.defaults
@@ -93,3 +93,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Increase LwIP IPv6 address number
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-10 : [Telink] Update Docker image (Zephyr update)
+11 : [ESP32] Update IDF to release v5.1.1
diff --git a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile
@@ -11,7 +11,7 @@ RUN set -x \
     && : # last line
 
 RUN set -x \
-    && git clone --recursive -b v5.1 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \
+    && git clone --recursive -b v5.1.1 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \
     && : # last line
 
 FROM ghcr.io/project-chip/chip-build:${VERSION}