From 519ad1a26b2b1df372fc217d08141ea9746f3e4f Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Wed, 21 Aug 2024 11:14:15 +0800
Subject: [PATCH 1/3] esp32: update esp_rcp_update version to 1.2.0

---
 .../esp32/components/chip/idf_component.yml   |  2 +-
 .../thread-br-app/esp32/create_ota_image.py   | 92 -------------------
 .../thread-br-app/esp32/main/CMakeLists.txt   | 10 --
 .../thread-br-app/esp32/sdkconfig.defaults    |  3 +
 src/platform/ESP32/OpenthreadLauncher.cpp     | 14 ++-
 src/platform/ESP32/OpenthreadLauncher.h       |  6 +-
 6 files changed, 13 insertions(+), 114 deletions(-)
 delete mode 100755 examples/thread-br-app/esp32/create_ota_image.py

diff --git a/config/esp32/components/chip/idf_component.yml b/config/esp32/components/chip/idf_component.yml
index b56040ea3aaa07..aeffec708dba8c 100644
--- a/config/esp32/components/chip/idf_component.yml
+++ b/config/esp32/components/chip/idf_component.yml
@@ -27,7 +27,7 @@ dependencies:
             - if: "target != esp32h2"
 
     espressif/esp_rcp_update:
-        version: "1.0.3"
+        version: "1.2.0"
         rules:
             - if: "idf_version >=5.0"
 
diff --git a/examples/thread-br-app/esp32/create_ota_image.py b/examples/thread-br-app/esp32/create_ota_image.py
deleted file mode 100755
index 56f7caa81f1b85..00000000000000
--- a/examples/thread-br-app/esp32/create_ota_image.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os
-import pathlib
-import struct
-
-FILETAG_RCP_VERSION = 0
-FILETAG_RCP_FLASH_ARGS = 1
-FILETAG_RCP_BOOTLOADER = 2
-FILETAG_RCP_PARTITION_TABLE = 3
-FILETAG_RCP_FIRMWARE = 4
-FILETAG_BR_OTA_IMAGE = 5
-FILETAG_IMAGE_HEADER = 0xff
-
-HEADER_ENTRY_SIZE = 3 * 4
-RCP_IMAGE_HEADER_SIZE = HEADER_ENTRY_SIZE * 6
-RCP_FLASH_ARGS_SIZE = 2 * 4 * 3
-
-
-def append_subfile_header(fout, tag, size, offset):
-    fout.write(struct.pack('<LLL', tag, size, offset))
-    return offset + size
-
-
-def append_subfile(fout, target_file):
-    buf_size = 4096
-    with open(target_file, 'rb') as fin:
-        data = fin.read(buf_size)
-        while data and len(data) > 0:
-            fout.write(data)
-            data = fin.read(buf_size)
-
-
-def append_flash_args(fout, flash_args_path):
-    with open(flash_args_path, 'r') as f:
-        # skip first line
-        next(f)
-        partition_info_list = [line.split() for line in f]
-    for offset, partition_file in partition_info_list:
-        offset = int(offset, 0)
-        if partition_file.find('bootloader') >= 0:
-            fout.write(struct.pack('<LL', FILETAG_RCP_BOOTLOADER, offset))
-        elif partition_file.find('partition_table') >= 0:
-            fout.write(struct.pack('<LL', FILETAG_RCP_PARTITION_TABLE, offset))
-        else:
-            fout.write(struct.pack('<LL', FILETAG_RCP_FIRMWARE, offset))
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--rcp-build-dir', type=str, required=True)
-    parser.add_argument('--br-firmware', type=str, required=False)
-    parser.add_argument('--target-file', type=str, required=True)
-    args = parser.parse_args()
-    base_dir = args.rcp_build_dir
-    pathlib.Path(os.path.dirname(args.target_file)).mkdir(parents=True, exist_ok=True)
-    rcp_version_path = os.path.join(base_dir, 'rcp_version')
-    flash_args_path = os.path.join(base_dir, 'flash_args')
-    bootloader_path = os.path.join(base_dir, 'bootloader', 'bootloader.bin')
-    partition_table_path = os.path.join(
-        base_dir, 'partition_table', 'partition-table.bin')
-    rcp_firmware_path = os.path.join(base_dir, 'esp_ot_rcp.bin')
-    with open(args.target_file, 'wb') as fout:
-        image_header_size = RCP_IMAGE_HEADER_SIZE
-        if args.br_firmware:
-            image_header_size += HEADER_ENTRY_SIZE
-        offset = append_subfile_header(
-            fout, FILETAG_IMAGE_HEADER, image_header_size, 0)
-        offset = append_subfile_header(
-            fout, FILETAG_RCP_VERSION, os.path.getsize(rcp_version_path), offset)
-        offset = append_subfile_header(
-            fout, FILETAG_RCP_FLASH_ARGS, RCP_FLASH_ARGS_SIZE, offset)
-        offset = append_subfile_header(
-            fout, FILETAG_RCP_BOOTLOADER, os.path.getsize(bootloader_path), offset)
-        offset = append_subfile_header(
-            fout, FILETAG_RCP_PARTITION_TABLE, os.path.getsize(partition_table_path), offset)
-        offset = append_subfile_header(
-            fout, FILETAG_RCP_FIRMWARE, os.path.getsize(rcp_firmware_path), offset)
-        if args.br_firmware:
-            offset = append_subfile_header(fout, FILETAG_BR_OTA_IMAGE, os.path.getsize(args.br_firmware), offset)
-        append_subfile(fout, rcp_version_path)
-        append_flash_args(fout, flash_args_path)
-        append_subfile(fout, bootloader_path)
-        append_subfile(fout, partition_table_path)
-        append_subfile(fout, rcp_firmware_path)
-        if args.br_firmware:
-            append_subfile(fout, args.br_firmware)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/examples/thread-br-app/esp32/main/CMakeLists.txt b/examples/thread-br-app/esp32/main/CMakeLists.txt
index 26c45e334cf3b7..c0cb1234b0cca3 100644
--- a/examples/thread-br-app/esp32/main/CMakeLists.txt
+++ b/examples/thread-br-app/esp32/main/CMakeLists.txt
@@ -61,16 +61,6 @@ idf_component_register(PRIV_INCLUDE_DIRS
 
 get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 
-idf_build_get_property(python PYTHON)
-add_custom_target(rcp_image_generation ALL
-    COMMAND ${python} ${CMAKE_CURRENT_SOURCE_DIR}/../create_ota_image.py
-    --rcp-build-dir $ENV{IDF_PATH}/examples/openthread/ot_rcp/build
-    --target-file ${CMAKE_CURRENT_BINARY_DIR}/spiffs_image/ot_rcp_0/rcp_image
-    )
-spiffs_create_partition_image(rcp_fw ${CMAKE_CURRENT_BINARY_DIR}/spiffs_image FLASH_IN_PROJECT
-                              DEPENDS rcp_image_generation)
-
-
 include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
 
 chip_app_component_codegen("${CHIP_ROOT}/examples/thread-br-app/thread-br-common/thread-br-app.matter")
diff --git a/examples/thread-br-app/esp32/sdkconfig.defaults b/examples/thread-br-app/esp32/sdkconfig.defaults
index dffd9283bc498a..20712bf96d5ae1 100644
--- a/examples/thread-br-app/esp32/sdkconfig.defaults
+++ b/examples/thread-br-app/esp32/sdkconfig.defaults
@@ -67,6 +67,9 @@ CONFIG_OPENTHREAD_DNS_CLIENT=n
 CONFIG_OPENTHREAD_BORDER_ROUTER=y
 CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER=n
 
+# Auto update RCP firmware
+CONFIG_AUTO_UPDATE_RCP=y
+
 # Use platform mDNS
 CONFIG_USE_MINIMAL_MDNS=n
 
diff --git a/src/platform/ESP32/OpenthreadLauncher.cpp b/src/platform/ESP32/OpenthreadLauncher.cpp
index d40e228954c5ee..63f1bac825214f 100644
--- a/src/platform/ESP32/OpenthreadLauncher.cpp
+++ b/src/platform/ESP32/OpenthreadLauncher.cpp
@@ -138,7 +138,7 @@ static void ot_task_worker(void * context)
     vTaskDelete(NULL);
 }
 
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
 
 static constexpr size_t kRcpVersionMaxSize = 100;
 static const char * TAG                    = "RCP_UPDATE";
@@ -183,16 +183,14 @@ static void try_update_ot_rcp(const esp_openthread_platform_config_t * config)
         esp_restart();
     }
 }
-#endif // CONFIG_OPENTHREAD_BORDER_ROUTER
 
 static void rcp_failure_handler(void)
 {
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
     esp_rcp_mark_image_unusable();
     try_update_ot_rcp(s_platform_config);
-#endif // CONFIG_OPENTHREAD_BORDER_ROUTER
     esp_rcp_reset();
 }
+#endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
 
 esp_err_t set_openthread_platform_config(esp_openthread_platform_config_t * config)
 {
@@ -208,7 +206,7 @@ esp_err_t set_openthread_platform_config(esp_openthread_platform_config_t * conf
     return ESP_OK;
 }
 
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
 esp_err_t openthread_init_br_rcp(const esp_rcp_update_config_t * update_config)
 {
     esp_err_t err = ESP_OK;
@@ -219,7 +217,7 @@ esp_err_t openthread_init_br_rcp(const esp_rcp_update_config_t * update_config)
     esp_openthread_register_rcp_failure_handler(rcp_failure_handler);
     return err;
 }
-#endif // CONFIG_OPENTHREAD_BORDER_ROUTER
+#endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
 
 esp_err_t openthread_init_stack(void)
 {
@@ -236,9 +234,9 @@ esp_err_t openthread_init_stack(void)
     assert(s_platform_config);
     // Initialize the OpenThread stack
     ESP_ERROR_CHECK(esp_openthread_init(s_platform_config));
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
     try_update_ot_rcp(s_platform_config);
-#endif // CONFIG_OPENTHREAD_BORDER_ROUTER
+#endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
 #ifdef CONFIG_OPENTHREAD_CLI
     esp_openthread_matter_cli_init();
     cli_command_transmit_task();
diff --git a/src/platform/ESP32/OpenthreadLauncher.h b/src/platform/ESP32/OpenthreadLauncher.h
index f6a7eb5d210cec..a15125f948d1dc 100644
--- a/src/platform/ESP32/OpenthreadLauncher.h
+++ b/src/platform/ESP32/OpenthreadLauncher.h
@@ -19,13 +19,13 @@
 
 #include <esp_err.h>
 #include <esp_openthread_types.h>
-#include <esp_rcp_update.h>
 #include <lib/core/CHIPError.h>
 #include <memory>
 
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
+#include <esp_rcp_update.h>
 esp_err_t openthread_init_br_rcp(const esp_rcp_update_config_t * update_config);
-#endif
+#endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
 esp_err_t set_openthread_platform_config(esp_openthread_platform_config_t * config);
 esp_err_t openthread_init_stack(void);
 esp_err_t openthread_launch_task(void);

From 97dbbb3022dbc94936bbf4da8a5eca3efcdb05c5 Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Wed, 21 Aug 2024 11:28:23 +0800
Subject: [PATCH 2/3] change for ESP32ThreadInit

---
 examples/platform/esp32/common/Esp32ThreadInit.cpp | 4 ++--
 examples/platform/esp32/common/Esp32ThreadInit.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/platform/esp32/common/Esp32ThreadInit.cpp b/examples/platform/esp32/common/Esp32ThreadInit.cpp
index f02f91c06d5538..985f7a3d4ac31b 100644
--- a/examples/platform/esp32/common/Esp32ThreadInit.cpp
+++ b/examples/platform/esp32/common/Esp32ThreadInit.cpp
@@ -42,7 +42,7 @@ void ESPOpenThreadInit()
         .host_config  = ESP_OPENTHREAD_DEFAULT_HOST_CONFIG(),
         .port_config  = ESP_OPENTHREAD_DEFAULT_PORT_CONFIG(),
     };
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
     esp_vfs_spiffs_conf_t rcp_fw_conf = {
         .base_path = "/rcp_fw", .partition_label = "rcp_fw", .max_files = 10, .format_if_mount_failed = false
     };
@@ -53,7 +53,7 @@ void ESPOpenThreadInit()
     }
     esp_rcp_update_config_t rcp_update_config = ESP_OPENTHREAD_RCP_UPDATE_CONFIG();
     openthread_init_br_rcp(&rcp_update_config);
-#endif // CONFIG_OPENTHREAD_BORDER_ROUTER
+#endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
     set_openthread_platform_config(&config);
 
     if (ThreadStackMgr().InitThreadStack() != CHIP_NO_ERROR)
diff --git a/examples/platform/esp32/common/Esp32ThreadInit.h b/examples/platform/esp32/common/Esp32ThreadInit.h
index affca51392f65a..a29fd5ff62afa8 100644
--- a/examples/platform/esp32/common/Esp32ThreadInit.h
+++ b/examples/platform/esp32/common/Esp32ThreadInit.h
@@ -84,7 +84,7 @@
         .storage_partition_name = "nvs", .netif_queue_size = 10, .task_queue_size = 10,                                            \
     }
 
-#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
 #include <esp_rcp_update.h>
 #define RCP_FIRMWARE_DIR "/spiffs/ot_rcp"
 
@@ -93,7 +93,7 @@
         .rcp_type = RCP_TYPE_ESP32H2_UART, .uart_rx_pin = 17, .uart_tx_pin = 18, .uart_port = 1, .uart_baudrate = 115200,          \
         .reset_pin = 7, .boot_pin = 8, .update_baudrate = 460800, .firmware_dir = "/rcp_fw/ot_rcp", .target_chip = ESP32H2_CHIP,   \
     }
-#endif // CONFIG_OPENTHREAD_BORDER_ROUTER
+#endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
 
 #endif // CONFIG_OPENTHREAD_ENABLED
 

From 75117202b59a3fa95ca93bf4e01ceef26d5e9c8e Mon Sep 17 00:00:00 2001
From: WanqQixiang <wangqixiang@espressif.com>
Date: Wed, 21 Aug 2024 14:24:55 +0800
Subject: [PATCH 3/3] fix compile error when lwip ipv6 address number > 8

---
 examples/thread-br-app/esp32/sdkconfig.defaults   | 2 +-
 src/platform/ESP32/DiagnosticDataProviderImpl.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/thread-br-app/esp32/sdkconfig.defaults b/examples/thread-br-app/esp32/sdkconfig.defaults
index 20712bf96d5ae1..498081c21f8c47 100644
--- a/examples/thread-br-app/esp32/sdkconfig.defaults
+++ b/examples/thread-br-app/esp32/sdkconfig.defaults
@@ -41,7 +41,7 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 # LWIP
 CONFIG_LWIP_IPV6_FORWARD=y
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=12
 CONFIG_LWIP_MULTICAST_PING=y
 CONFIG_LWIP_NETIF_STATUS_CALLBACK=y
 CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
index 33de4d372199ee..fc2992f20d3fc9 100644
--- a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
@@ -206,7 +206,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     esp_netif_t * netif     = esp_netif_next(NULL);
     NetworkInterface * head = NULL;
     uint8_t ipv6_addr_count = 0;
-    esp_ip6_addr_t ip6_addr[kMaxIPv6AddrCount];
+    esp_ip6_addr_t ip6_addr[LWIP_IPV6_NUM_ADDRESSES];
     if (netif == NULL)
     {
         ChipLogError(DeviceLayer, "Failed to get network interfaces");
@@ -253,7 +253,6 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
 #endif // !defined(CONFIG_DISABLE_IPV4)
 
             static_assert(kMaxIPv6AddrCount <= UINT8_MAX, "Count might not fit in ipv6_addr_count");
-            static_assert(ArraySize(ip6_addr) >= LWIP_IPV6_NUM_ADDRESSES, "Not enough space for our addresses.");
             auto addr_count = esp_netif_get_all_ip6(ifa, ip6_addr);
             if (addr_count < 0)
             {