Skip to content

Commit 4b36f9f

Browse files
sigvartmhjfischer-no
authored andcommitted
[nrf noup] zephyr: Boot even if EXT_ABI is not provided
This removes the `return;` to ensure that the application is booted even if EXT_ABI is not provided to the application because it does not include `FW_INFO`. Added a bit more description to the error messages when FW_INFO is not found and EXT_ABI is not able to be provided to the next image. Ref. NCSDK-24132 Signed-off-by: Sigvart Hovland <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit e6e72a0)
1 parent 90a91e0 commit 4b36f9f

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

boot/zephyr/main.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,16 @@ static void do_boot(struct boot_rsp *rsp)
258258
#endif
259259

260260
#if defined(CONFIG_FW_INFO) && !defined(CONFIG_EXT_API_PROVIDE_EXT_API_UNUSED)
261-
bool provided = fw_info_ext_api_provide(fw_info_find((uint32_t)vt), true);
261+
const struct fw_info *firmware_info = fw_info_find((uint32_t) vt);
262+
bool provided = fw_info_ext_api_provide(firmware_info, true);
262263

263264
#ifdef PM_S0_ADDRESS
264265
/* Only fail if the immutable bootloader is present. */
265266
if (!provided) {
266-
BOOT_LOG_ERR("Failed to provide EXT_APIs\n");
267-
return;
267+
if (firmware_info == NULL) {
268+
BOOT_LOG_WRN("Unable to find firmware info structure in %p", vt);
269+
}
270+
BOOT_LOG_ERR("Failed to provide EXT_APIs to %p", vt);
268271
}
269272
#endif
270273
#endif

0 commit comments

Comments
 (0)