Skip to content

sysbuild: Add QSPI XIP split image flag setting for DirectXIP mode #17227

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 2 commits into from
Sep 11, 2024
Merged

sysbuild: Add QSPI XIP split image flag setting for DirectXIP mode #17227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42314af
manifest: Update sdk-zephyr
nordicjm Sep 9, 2024
b033098
sysbuild: Add QSPI XIP split image flag setting for DirectXIP mode
nordicjm Sep 9, 2024
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
9 changes: 9 additions & 0 deletions sysbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
set_config_bool(${DEFAULT_IMAGE} CONFIG_HAVE_CUSTOM_LINKER_SCRIPT y)
set_config_bool(${DEFAULT_IMAGE} CONFIG_BUILD_NO_GAP_FILL y)

# Set required options if MCUmgr img mgmt is used
if(SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT config? should it be also checked here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DirectXIP with revert mode is not supported in QSPI split image mode because if you confirm one and do not confirm the other, you will reboot into a bricked module

set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE y)
else()
set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE n)
endif()

if(NOT DEFINED SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK)
# If external driver check Kconfig is enabled then users will need to select their own
# Kconfigs (to allow for forked/derivative QSPI NOR drivers), otherwise force enable the
Expand All @@ -289,6 +296,8 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
IMAGE_CONF_SCRIPT ${ZEPHYR_NRF_MODULE_DIR}/sysbuild/image_configurations/firmware_loader_image_default.cmake
)
endif()

set_config_bool(${DEFAULT_IMAGE} CONFIG_MCUMGR_GRP_IMG_QSPI_XIP_SPLIT_IMAGE n)
endif()

if(SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK)
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: e734c8433f00bef70f08c682313e19792dc07ad8
revision: 6debbaf8115c13f31fca0d6acdadfad153e413b4
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading