Skip to content
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

sysbuild: Prevent some configuration options with single image mode #19344

Merged
merged 2 commits into from
Dec 16, 2024
Merged

sysbuild: Prevent some configuration options with single image mode #19344

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
632fa1f
sysbuild: Prevent some configuration options with single image mode
nordicjm Dec 9, 2024
9a4763b
manifest: Update sdk-mcuboot
nordicjm Dec 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
4 changes: 3 additions & 1 deletion sysbuild/Kconfig.mcuboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ config MCUBOOT_COMPRESSED_IMAGE_SUPPORT

config MCUBOOT_MAX_UPDATEABLE_IMAGES
int
default 1 if MCUBOOT_MODE_SINGLE_APP
default 4

config MCUBOOT_APPLICATION_IMAGE_NUMBER
Expand All @@ -63,7 +64,7 @@ config MCUBOOT_APPLICATION_IMAGE_NUMBER

config MCUBOOT_NETWORK_CORE_IMAGE_NUMBER
int
default 1 if NETCORE_APP_UPDATE
default 1 if NETCORE_APP_UPDATE && !MCUBOOT_MODE_SINGLE_APP
default -1

config MCUBOOT_WIFI_PATCHES_IMAGE_NUMBER
Expand Down Expand Up @@ -177,6 +178,7 @@ config MCUBOOT_USE_ALL_AVAILABLE_RAM
config MCUBOOT_NRF53_MULTI_IMAGE_UPDATE
bool "Network core multi-image update (in single operation)"
depends on NETCORE_APP_UPDATE
depends on !MCUBOOT_MODE_SINGLE_APP
help
If selected, network core image updates can be applied in a single operation. This is
required if the secondary partition resides in off-chip memory.
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 @@ -130,7 +130,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: v2.1.0-ncs3-rc1
revision: b82206c15fff357c151c24bf97c99c4348d14a46
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR
Expand Down
Loading