[nrf noup] boot/zephyr: fix fw_info search

By the upstream patch the vt get now the pointer to the copy of the arm_vector instead of original. This patch fixes address of the firmware which is to be taken by the fw_info_find. Signed-off-by: Andrzej Puzdrowski <[email protected]> (cherry picked from commit 3be724f)
voxelbotics · Jun 28, 2024 · f3ae1af · f3ae1af
1 parent f0a0c50
commit f3ae1af
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
@@ -206,7 +206,14 @@ static void do_boot(struct boot_rsp *rsp)
 #endif
 
 #if defined(CONFIG_FW_INFO) && !defined(CONFIG_EXT_API_PROVIDE_EXT_API_UNUSED)
-    const struct fw_info *firmware_info = fw_info_find((uint32_t) vt);
+    uintptr_t fw_start_addr;
+
+    rc = flash_device_base(rsp->br_flash_dev_id, &fw_start_addr);
+    assert(rc == 0);
+
+    fw_start_addr += rsp->br_image_off + rsp->br_hdr->ih_hdr_size;
+
+    const struct fw_info *firmware_info = fw_info_find(fw_start_addr);
     bool provided = fw_info_ext_api_provide(firmware_info, true);
 
 #ifdef PM_S0_ADDRESS