mcuboot: Add support for swap using offset algorithm #83893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following west manifest projects have changed revision in this Pull Request:
Additional metadata changed:
⛔ DNM label due to: 1 project with metadata changes Note: This message is automatically posted and updated by the Manifest GitHub Action. |
zephyrbot
added
manifest
manifest-mcuboot
DNM
nordicjm
force-pushed
the
swaplesserase
branch
3 times, most recently
from
3ad19c7 to
f9224a0
Compare
nordicjm
force-pushed
the
swaplesserase
branch
2 times, most recently
from
9990c03 to
feaeb92
Compare
zephyrbot
added
area: DFU
zephyrbot
added
area: Bootloader
area: Build System
area: Sysbuild
area: Coding Guidelines
zephyrbot
requested review from
57300,
carlescufi,
fabiobaltieri,
jeremybettis,
jfischer-no and
kartben
gchwier
previously approved these changes
Jan 29, 2025
nordicjm
force-pushed
the
swaplesserase
branch
from
7599ddb to
a89ba0f
Compare
de-nordic
previously approved these changes
Jan 31, 2025
Update Zephyr fork of MCUboot to revision:
9a02794a14fa2e539ffe039a986360590d9e025f
Brings following Zephyr relevant fixes:
- 9a02794a boot: bootutil: swap_offset: Skip erasing/copying
empty sectors
- 96b70086 zephyr: Fix image encryption configuration for
mbedTLS.
- e5b89529 boot: boot_serial: Add support for swap using offset
mode
- 18fee817 zephyr: Add support for swap using offset mode
- 4af73169 boot: bootutil: Add swap using offset algorithm
- 9668469f zephyr: Add Kconfig option to select PureEdDS
- 96f01aad zephyr: Add Kconfig and configuration for SHA on
storage
- 30e6adfe zephyr: Allow SHA512 with TinyCrypt
- de9bc3d0 bootutil: PureEdDSA using ED25519
- b43b8c80 bootutil: Enable hash calculation directly on storage
- f72158ff bootutil: Allow SHA512 with TinyCrypt
- 4b8a37bb zephyr: Add imgtool/cbor to pip packages installed by
west
- 3f672134 zephyr: Fix usage of CONFIG_MBEDTLS_BUILTIN and ASN1
- c6f5db29 bootutil: Add missing MBEDTLS_ASN1_PARSE_C
Signed-off-by: Jamie McCrae <[email protected]>
Adds a new Kconfig for selecting swap using move in MCUboot which aligns with the proper MCUboot symbol and allows for adding additional mode Kconfigs Signed-off-by: Jamie McCrae <[email protected]>
Deprecates the old Kconfig and adds a new one which lines up with the name of the Kconfig used by MCUboot Signed-off-by: Jamie McCrae <[email protected]>
Allows using this newly introduced MCUboot algorithm Signed-off-by: Jamie McCrae <[email protected]>
Adds a new Kconfig to allow selecting this newly introduced MCUboot swapping algorithm Signed-off-by: Jamie McCrae <[email protected]>
Adds details on how to select this new operating mode when using and when not using sysbuild, also includes a note about a Kconfig being deprecated and the name of the replacement symbol Signed-off-by: Jamie McCrae <[email protected]>
Adds a Kconfig used for configuring MCUboot to the allow list Signed-off-by: Jamie McCrae <[email protected]>
Adds a variation of the test which tests swap using offset mode, based on the swap using move test Signed-off-by: Jamie McCrae <[email protected]>
Adds a variation of the test which tests swap using offset mode, based on the swap using move test Signed-off-by: Jamie McCrae <[email protected]>
nordicjm
force-pushed
the
swaplesserase
branch
from
a89ba0f to
8f29524
Compare
|
@butok that issue should be fixed now, can you try again? |
de-nordic
approved these changes
Feb 7, 2025
If you are able to build it on your system, it's my local problem => ignore my issue. |
Builds here: |
butok
approved these changes
Feb 7, 2025
d3zd3z
approved these changes
Feb 10, 2025
| #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_USING_OFFSET) | ||
| #define BOOTLOADER_MODE MCUBOOT_MODE_SWAP_USING_OFFSET | ||
| #elif defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_USING_MOVE) || \ | ||
| defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_WITHOUT_SCRATCH) |
There was a problem hiding this comment.
This would be a lot nicer to indent the second line. Not urgent enough, but if you have to fix it for something else.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This new mode offers a faster update time and erase a whole round of sector erases/writes from the primary slot
Split MCUboot PR update due to commit being in #83294