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

Jump to bottom

mcuboot: multi-image: Multi Image DFU without external flash #10060

Closed
wants to merge 1 commit into from
Closed

mcuboot: multi-image: Multi Image DFU without external flash #10060

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
7 changes: 7 additions & 0 deletions doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ IDE and tool support

|no_changes_yet_note|

MCUboot
=======

* Added:

* Support for multi-image DFU without using external flash memory on nRF53.

Application development
=======================

Expand Down
1 change: 0 additions & 1 deletion modules/mcuboot/boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ config NRF53_MULTI_IMAGE_UPDATE
depends on FLASH_SIMULATOR
depends on FLASH_SIMULATOR_DOUBLE_WRITES
depends on !FLASH_SIMULATOR_STATS
depends on PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
depends on BOOT_UPGRADE_ONLY || USE_NRF53_MULTI_IMAGE_WITHOUT_UPGRADE_ONLY
depends on $(dt_compat_enabled,$(DT_COMPAT_SIM_FLASH))
select NRF53_MCUBOOT_PRIMARY_1_RAM_FLASH
Expand Down
21 changes: 18 additions & 3 deletions subsys/partition_manager/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,26 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
# option is propagated to the MCUboot child image automatically.
depends on PM_EXTERNAL_FLASH_ENABLED || MCUBOOT
default y if BOOTLOADER_MCUBOOT
imply PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY_1
Copy link
Contributor

Choose a reason for hiding this comment

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

Would like @tejlmand to comment on this from a sysbuild perspective, how can this be used from sysbuild since these do not apply

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know how sysbuild handles putting things in external flash to be honest. I'm a bit out of the loop on the whole sysbuild system also :(

Copy link
Contributor

Choose a reason for hiding this comment

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

@sigvartmh @tejlmand @nordicjm Can you find an agreement here?

help
Place the secondary partition of MCUboot image 0 in the external flash
instead of the internal flash. This option should only be enabled by
the user in the parent image. The value of this option is propagated to
the MCUboot child image automatically.

config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY_1
bool "Place MCUboot secondary 1 in external flash"
depends on BOOTLOADER_MCUBOOT || MCUBOOT
# Only depend on the chosen for the parent image.
depends on $(dt_chosen_enabled,$(DT_CHOSEN_EXT_FLASH)) || MCUBOOT
depends on UPDATEABLE_IMAGE_NUMBER > 1 || !MCUBOOT
default y if BOOTLOADER_MCUBOOT
imply ADD_MCUBOOT_MEDIATE_SIM_FLASH_DTS
help
Place the secondary partition of MCUboot in the external flash instead
of the internal flash. This option should only be enabled by the user
in the parent image.
Place the secondary partition of MCUboot image 1 in the external flash
instead of the internal flash. This option should only be enabled by
the user in the parent image. The value of this option is propagated
to the MCUboot child image automatically.

config PM_IMAGE_NOT_BUILT_FROM_SOURCE
bool
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 @@ -129,7 +129,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: a9d5fa76a6840f8934b2aaaf51e290f91eb3f991
revision: pull/235/head
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR.git
Expand Down
Loading