Skip to content

Commit 470e2fe

Browse files
committed
[nrf fromlist] zephyr: Add support for slot selection boot hook
Add a Kconfig option to enable a bootloader hook to alter the logic of the active slot selection in Direct XIP modes. Upstream PR #: 2402 Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent b86fb45 commit 470e2fe

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

boot/zephyr/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,6 +1122,13 @@ config MCUBOOT_ACTION_HOOKS
11221122
'mcuboot_status_type_t' is listed in
11231123
boot/bootutil/include/bootutil/mcuboot_status.h
11241124

1125+
config FIND_NEXT_SLOT_HOOKS
1126+
bool "Enable hooks for finding the next active slot"
1127+
help
1128+
Allow to provide procedures for override or extend the search policy
1129+
for the best slot to boot in the Direct XIP mode.
1130+
By default a slot with the highest version is selected.
1131+
11251132
config BOOT_DISABLE_CACHES
11261133
bool "Disable I/D caches before chain-loading application"
11271134
depends on CPU_HAS_ICACHE || CPU_HAS_DCACHE

boot/zephyr/hooks_sample.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,8 @@ int boot_img_install_stat_hook(int image_index, int slot, int *img_install_stat)
9393
{
9494
return BOOT_HOOK_REGULAR;
9595
}
96+
97+
int boot_find_next_slot_hook(struct boot_loader_state *state, uint8_t image, uint32_t *active_slot)
98+
{
99+
return BOOT_HOOK_REGULAR;
100+
}

boot/zephyr/include/mcuboot_config/mcuboot_config.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,10 @@
267267
#define MCUBOOT_FLASH_AREA_HOOKS
268268
#endif
269269

270+
#ifdef CONFIG_FIND_NEXT_SLOT_HOOKS
271+
#define MCUBOOT_FIND_NEXT_SLOT_HOOKS
272+
#endif
273+
270274
#ifdef CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS
271275
#define MCUBOOT_VERIFY_IMG_ADDRESS
272276
#endif

0 commit comments

Comments
 (0)