Skip to content

Commit 41cc274

Browse files
sigvartmhrlubos
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) (cherry picked from commit 4b36f9f) Signed-off-by: Robert Lubos <[email protected]>
1 parent af27205 commit 41cc274

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
@@ -192,13 +192,16 @@ static void do_boot(struct boot_rsp *rsp)
192192
#endif
193193

194194
#if defined(CONFIG_FW_INFO) && !defined(CONFIG_EXT_API_PROVIDE_EXT_API_UNUSED)
195-
bool provided = fw_info_ext_api_provide(fw_info_find((uint32_t)vt), true);
195+
const struct fw_info *firmware_info = fw_info_find((uint32_t) vt);
196+
bool provided = fw_info_ext_api_provide(firmware_info, true);
196197

197198
#ifdef PM_S0_ADDRESS
198199
/* Only fail if the immutable bootloader is present. */
199200
if (!provided) {
200-
BOOT_LOG_ERR("Failed to provide EXT_APIs\n");
201-
return;
201+
if (firmware_info == NULL) {
202+
BOOT_LOG_WRN("Unable to find firmware info structure in %p", vt);
203+
}
204+
BOOT_LOG_ERR("Failed to provide EXT_APIs to %p", vt);
202205
}
203206
#endif
204207
#endif

0 commit comments

Comments
 (0)