From 774c0c31d7e411e9f5ed55d3b34803553755e4de Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 16 Oct 2024 09:02:53 +0100 Subject: [PATCH] [nrf noup] mgmt: mcumgr: bootutil_hooks: nrf53_hooks: Handle sysbuild image ID fixup! [nrf noup] mgmt/mcumgr: Bootutil hooks to handle image-1 Adds support for sysbuild assigned image IDs Signed-off-by: Jamie McCrae --- subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c index 9971a4e0843..f1ac8a168e6 100644 --- a/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c +++ b/subsys/mgmt/mcumgr/bootutil_hooks/nrf53_hooks.c @@ -8,10 +8,18 @@ #include #include "bootutil/bootutil_public.h" +#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1 +/* Sysbuild */ +#define NET_CORE_IMAGE CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER +#else +/* Legacy child/parent */ +#define NET_CORE_IMAGE 1 +#endif + int boot_read_swap_state_primary_slot_hook(int image_index, struct boot_swap_state *state) { - if (image_index == 1) { + if (image_index == NET_CORE_IMAGE) { /* Pretend that primary slot of image 1 unpopulated */ state->magic = BOOT_MAGIC_UNSET; state->swap_type = BOOT_SWAP_TYPE_NONE;