add thread br ota file generate and fix some issue

Author: Jerry-ESP

config/esp32/components/chip/CMakeLists.txt

@@ -345,8 +345,8 @@ endif()
 
 set(args_gn "${CMAKE_CURRENT_BINARY_DIR}/args.gn")
 add_custom_command(OUTPUT "${args_gn}"
-                   COMMAND ${python} 
-                           ${CMAKE_CURRENT_LIST_DIR}/create_args_gn.py 
+                   COMMAND ${python}
+                           ${CMAKE_CURRENT_LIST_DIR}/create_args_gn.py
                            "${CMAKE_BINARY_DIR}"
                            "${idf_path}"
                            "${CMAKE_CURRENT_LIST_DIR}/chip.c"
@@ -468,10 +468,19 @@ endif()
 
 # Build Matter OTA image
 if (CONFIG_CHIP_OTA_IMAGE_BUILD)
-    chip_ota_image(chip-ota-image
-        INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin
-        OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin
-    )
-    # Adding dependecy as app target so that this runs after images are ready
-    add_dependencies(chip-ota-image app)
+    if (CONFIG_OPENTHREAD_BORDER_ROUTER AND CONFIG_AUTO_UPDATE_RCP)
+        chip_ota_image(chip-ota-image
+            INPUT_FILES ${BUILD_DIR}/ota_with_rcp_image
+            OUTPUT_FILE ${BUILD_DIR}/ota_with_rcp_image-ota.bin
+        )
+        # Adding dependecy as app target so that this runs after images are ready
+        add_dependencies(chip-ota-image gen_ota_image)
+    else()
+        chip_ota_image(chip-ota-image
+            INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin
+            OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin
+        )
+        # Adding dependecy as app target so that this runs after images are ready
+        add_dependencies(chip-ota-image app)
+    endif()
 endif()

examples/thread-br-app/esp32/README.md

@@ -97,12 +97,6 @@ the Thread network.
 
 ### Generate OTA Firmware For BR
 
-After enable the option `CONFIG_CREATE_OTA_IMAGE_WITH_RCP_FW` in menuconfig,
-will generate OTA image with rcp firmware in build process, named
-`ota_with_rcp_image` in build folder.
-
-Then can add a Matter OTA header for the ota_with_rcp_image file.
-
-```
-./ota_image_tool.py create -v 65521 -p 32768 --version 1 --version-str "v1.0" -da sha256 build/ota_with_rcp_image ota_with_rcp_image.ota
-```
+After enable the option `CONFIG_CREATE_OTA_IMAGE_WITH_RCP_FW` and 
+`CONFIG_CHIP_OTA_IMAGE_BUILD` in menuconfig, will generate OTA image with rcp 
+firmware, named `ota_with_rcp_image_ota.bin` in build folder.

src/platform/ESP32/OTAImageProcessorImpl.cpp

@@ -281,26 +281,25 @@ esp_err_t OTAImageProcessorImpl::DeltaOTAWriteCallback(const uint8_t * buf, size
 #endif // CONFIG_ENABLE_DELTA_OTA
 
 #if defined(CONFIG_AUTO_UPDATE_RCP) && defined(CONFIG_OPENTHREAD_BORDER_ROUTER)
-esp_err_t OTAImageProcessorImpl::ProcessRcpImage(intptr_t context, const uint8_t * buffer, uint32_t bufLen)
+esp_err_t OTAImageProcessorImpl::ProcessRcpImage(const uint8_t * buffer, uint32_t bufLen)
 {
-    esp_err_t err         = ESP_OK;
-    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    esp_err_t err = ESP_OK;
 
-    if (!imageProcessor->mRcpDone)
+    if (!this->mRcpFirmwareDownloaded)
     {
         size_t rcpOtaReceivedLen = 0;
-        err                      = esp_rcp_ota_receive(imageProcessor->mRcpOtaHandle, buffer, bufLen, &rcpOtaReceivedLen);
+        err                      = esp_rcp_ota_receive(this->mRcpOtaHandle, buffer, bufLen, &rcpOtaReceivedLen);
 
-        if (esp_rcp_ota_get_state(imageProcessor->mRcpOtaHandle) == ESP_RCP_OTA_STATE_FINISHED)
+        if (esp_rcp_ota_get_state(this->mRcpOtaHandle) == ESP_RCP_OTA_STATE_FINISHED)
         {
-            imageProcessor->mBrFirmwareSize = esp_rcp_ota_get_subfile_size(imageProcessor->mRcpOtaHandle, FILETAG_HOST_FIRMWARE);
-            err = esp_ota_write(imageProcessor->mOTAUpdateHandle, buffer + rcpOtaReceivedLen, bufLen - rcpOtaReceivedLen);
-            imageProcessor->mRcpDone = true;
+            this->mBrFirmwareSize = esp_rcp_ota_get_subfile_size(this->mRcpOtaHandle, FILETAG_HOST_FIRMWARE);
+            err                   = esp_ota_write(this->mOTAUpdateHandle, buffer + rcpOtaReceivedLen, bufLen - rcpOtaReceivedLen);
+            this->mRcpFirmwareDownloaded = true;
         }
     }
-    else if (imageProcessor->mBrFirmwareSize > 0)
+    else if (this->mBrFirmwareSize > 0)
     {
-        err = esp_ota_write(imageProcessor->mOTAUpdateHandle, buffer, bufLen);
+        err = esp_ota_write(this->mOTAUpdateHandle, buffer, bufLen);
     }
     else
     {
@@ -369,9 +368,9 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
 #endif // CONFIG_ENABLE_ENCRYPTED_OTA
 
 #if defined(CONFIG_AUTO_UPDATE_RCP) && defined(CONFIG_OPENTHREAD_BORDER_ROUTER)
-    imageProcessor->mRcpOtaHandle   = 0;
-    imageProcessor->mBrFirmwareSize = 0;
-    imageProcessor->mRcpDone        = false;
+    imageProcessor->mRcpOtaHandle          = 0;
+    imageProcessor->mBrFirmwareSize        = 0;
+    imageProcessor->mRcpFirmwareDownloaded = false;
     if (esp_rcp_ota_begin(&imageProcessor->mRcpOtaHandle) != ESP_OK)
     {
         return;
@@ -424,9 +423,9 @@ void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
 #elif defined(CONFIG_AUTO_UPDATE_RCP) && defined(CONFIG_OPENTHREAD_BORDER_ROUTER)
     esp_err_t err = esp_rcp_ota_end(imageProcessor->mRcpOtaHandle);
     err |= esp_ota_end(imageProcessor->mOTAUpdateHandle);
-    imageProcessor->mRcpOtaHandle   = 0;
-    imageProcessor->mBrFirmwareSize = 0;
-    imageProcessor->mRcpDone        = false;
+    imageProcessor->mRcpOtaHandle          = 0;
+    imageProcessor->mBrFirmwareSize        = 0;
+    imageProcessor->mRcpFirmwareDownloaded = false;
 #else
     esp_err_t err = esp_ota_end(imageProcessor->mOTAUpdateHandle);
 #endif // CONFIG_ENABLE_DELTA_OTA
@@ -473,9 +472,9 @@ void OTAImageProcessorImpl::HandleAbort(intptr_t context)
     {
         ESP_LOGE(TAG, "ESP RCP OTA abort failed");
     }
-    imageProcessor->mRcpOtaHandle   = 0;
-    imageProcessor->mBrFirmwareSize = 0;
-    imageProcessor->mRcpDone        = false;
+    imageProcessor->mRcpOtaHandle          = 0;
+    imageProcessor->mBrFirmwareSize        = 0;
+    imageProcessor->mRcpFirmwareDownloaded = false;
 #endif
 
     if (esp_ota_abort(imageProcessor->mOTAUpdateHandle) != ESP_OK)
@@ -541,7 +540,7 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
     // Apply the patch and writes that data to the passive partition.
     err = esp_delta_ota_feed_patch(imageProcessor->mDeltaOTAUpdateHandle, blockToWrite.data() + index, blockToWrite.size() - index);
 #elif defined(CONFIG_AUTO_UPDATE_RCP) && defined(CONFIG_OPENTHREAD_BORDER_ROUTER)
-    err                             = imageProcessor->ProcessRcpImage(context, blockToWrite.data(), blockToWrite.size());
+    err                                    = imageProcessor->ProcessRcpImage(blockToWrite.data(), blockToWrite.size());
 #else
     err           = esp_ota_write(imageProcessor->mOTAUpdateHandle, blockToWrite.data(), blockToWrite.size());
 #endif // CONFIG_ENABLE_DELTA_OTA

src/platform/ESP32/OTAImageProcessorImpl.h

@@ -108,9 +108,9 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
 
 #if defined(CONFIG_AUTO_UPDATE_RCP) && defined(CONFIG_OPENTHREAD_BORDER_ROUTER)
     esp_rcp_ota_handle_t mRcpOtaHandle;
-    bool mRcpDone;
+    bool mRcpFirmwareDownloaded;
     uint32_t mBrFirmwareSize;
-    esp_err_t ProcessRcpImage(intptr_t context, const uint8_t * buffer, uint32_t bufLen);
+    esp_err_t ProcessRcpImage(const uint8_t * buffer, uint32_t bufLen);
 #endif
 };