Skip to content

[nrf noup] mgmt: mcumgr: grp: img_mgmt: Add handling for QSPI XIP #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2024
Merged

[nrf noup] mgmt: mcumgr: grp: img_mgmt: Add handling for QSPI XIP #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,14 @@ config MCUMGR_GRP_IMG_TOO_LARGE_BOOTLOADER_INFO

endchoice

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.

module = MCUMGR_GRP_IMG
module-str = mcumgr_grp_img
source "subsys/logging/Kconfig.template.log_config"
Expand Down
6 changes: 6 additions & 0 deletions subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ int img_mgmt_active_slot(int image)
/* Multi image does not support DirectXIP currently */
#if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1
slot = (image << 1);

#if CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE
if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
slot += 1;
}
#endif
#else
/* This covers single image, including DirectXiP */
if (FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
Expand Down
Loading