mgmt: mcumgr: grp: img_mgmt: Add handling for QSPI XIP

Adds handling code to allow selecting the correct image slot when
using QSPI XIP in DirectXIP mode

In case of Direct XIP and multiple images, the radio active slot changes
accordingly (i.e. application slot 1 boots radio slot 1).

Moved from sdk-zephyr commit: 0fb761832466933b322fb8030c9ec934b62aa128

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig

@@ -13,4 +13,15 @@ config MCUMGR_GRP_IMG_NRF
 	  Enables use of an extended version of the image management implementation that adds
 	  Nordic-specific functionalities.
 
+if MCUMGR_GRP_IMG_NRF
+
+config MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
+	bool "QSPI XIP Split image mode"
+	depends on MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
+	help
+	  This option should not be selected by users and should automatically be selected by
+	  sysbuild if needed. This enables selecting the correct slot when running a QSPI XIP
+	  split image application in DirectXIP mode.
+
+endif # MCUMGR_GRP_IMG_NRF
 endmenu

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

@@ -218,6 +218,14 @@ int img_mgmt_active_slot(int image)
 	/* Multi image does not support DirectXIP or RAM load currently */
 #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
 	slot = (image << 1);
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE) ||                                         \
+	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP) ||                                      \
+	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT)
+	if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
+		slot += 1;
+	}
+#endif
 #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)
 	/* RAM load requires querying bootloader */
 	int rc;