Skip to content

Conversation

@nordicjm
Copy link
Contributor

This swapping method is more efficient than swap using move and has been available for some time, remove experimental flag and set it as the default except for stm32 devices which have partition alignment for swap using move

FYI @erwango

This swapping method is more efficient than swap using move and
has been available for some time, remove experimental flag and
set it as the default except for stm32 devices which have
partition alignment for swap using move

Signed-off-by: Jamie McCrae <[email protected]>
@sonarqubecloud
Copy link

config MCUBOOT_MODE_SWAP_USING_OFFSET
bool "Swap using offset"
select EXPERIMENTAL
help
Copy link
Contributor

Choose a reason for hiding this comment

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

Funnily this description isn't really helpful IMO. I would have expected to learn about the difference between USING_MOVE vs USING_OFFSET from the help texts. But they appear to be identical.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure, but it wouldn't hurt refer to it.

Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

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

minor non-blocking comment, and also think this would be nice:
#93310 (comment)

Comment on lines +35 to +36
# Should be removed if board dts is updated
default MCUBOOT_MODE_SWAP_USING_MOVE if SOC_FAMILY_STM32
Copy link
Contributor

Choose a reason for hiding this comment

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

would be nice if comment contains a bit more info, for example.

# default MCUBOOT_MODE_SWAP_USING_MOVE should be removed if STM32 board dts is updated

especially because sometimes when code gets updated then developers forget to remove the comment, making other people puzzled on the meaning of the comment.

btw. you mention board dts, but checks againts STM32 SoC.
Is this in the board dts for all STM32, or in a soc dts ?

@cfriedt cfriedt merged commit 7a76a62 into zephyrproject-rtos:main Jul 30, 2025
30 checks passed
@cfriedt
Copy link
Member

cfriedt commented Jul 30, 2025

minor non-blocking comment, and also think this would be nice:
#93310 (comment)

Sorry @tejlmand - I only saw this after merging. I should have given @nordicjm a bit of time to address your comment.

@gchwier
Copy link
Contributor

gchwier commented Aug 1, 2025

Introduced regression in tests:

  • nrf52840dk/nrf52840:tests/boot/mcuboot_data_sharing:bootloader.mcuboot.data.sharing
  • nrf52840dk/nrf52840:tests/boot/test_mcuboot:bootloader.mcuboot
    can be checked with command:
    $ZEPHYR_BASE/scripts/twister -v -c --device-testing -p nrf52840dk/nrf52840 --device-serial /dev/ttyACM0 --west-flash="--erase" -T $ZEPHYR_BASE/tests/boot/mcuboot_data_sharing -s bootloader.mcuboot.data.sharing

@nordicjm nordicjm deleted the sbswapoffset branch September 23, 2025 10:56
@JarmouniA JarmouniA added the Release Notes Required Release notes required for this change label Oct 22, 2025
@JarmouniA
Copy link
Contributor

@nordicjm this major change should be detailed in the migration guide.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants