update asr ota image tool (#27500)

project-chip · Oct 6, 2023 · 2881441 · 2881441
1 parent b824022
commit 2881441
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/examples/ota-requestor-app/asr/README.md b/examples/ota-requestor-app/asr/README.md
@@ -53,9 +53,9 @@ guides to get started
     ./chip-tool pairing onnetwork 1 20202021
     ```
 -   After OTA Provider commissioning is successful, use `chip-tool` to write ACL
-    for OAT Provider.
+    for OTA Provider.
     ```
-    ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null }]' <OTA REQUESTOR APP NODE ID> 0
+    ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null }]' 1 0
     ```
 -   Commission ota requestor device with node-id `OTA REQUESTOR APP NODE ID`
 -   After OTA Requestor commissioning is successful, use `chip-tool` to inform

diff --git a/third_party/asr/asr582x/asr_sdk b/third_party/asr/asr582x/asr_sdk
diff --git a/third_party/asr/asr595x/asr_sdk b/third_party/asr/asr595x/asr_sdk
diff --git a/third_party/asr/asr_executable.gni b/third_party/asr/asr_executable.gni
@@ -40,29 +40,33 @@ template("asr_executable") {
 
     outputs = [ "${root_out_dir}/${output_base_name}_ota.bin" ]
 
-    if (asr_ic_family == "asr595x") {
-      gen_ota_tool = "${asr_sdk_build_root}/asr_sdk/tools/image_gen_header/image_gen_header"
-    } else {
-      gen_ota_tool =
-          "${asr_sdk_build_root}/asr_sdk/tools/otaImage/image_gen_header"
-    }
+    gen_ota_tool =
+        "${asr_sdk_build_root}/asr_sdk/tools/otaImage/image_gen_header"
 
     _ota_tool_path = rebase_path(gen_ota_tool, root_build_dir)
 
+    _image_path =
+        rebase_path("$root_out_dir/${objcopy_image_name}", root_build_dir)
+
     if (asr_ic_family == "asr595x") {
       args = [
         _ota_tool_path,
-        "${root_out_dir}/${objcopy_image_name}",
+        _image_path,
         "-d",
-        "LEGA_A0V2",
+        "ALTO",
         "-b",
         "REMAPPING",
+        "-r",
       ]
     } else {
       args = [
         _ota_tool_path,
-        "${root_out_dir}/${objcopy_image_name}",
-        "flash_remapping",
+        _image_path,
+        "-d",
+        "COMBO",
+        "-b",
+        "REMAPPING",
+        "-r",
       ]
     }