[nrf fromlist] tests: boot: Fix bootloader.mcuboot boot loop for nrf … #3356
+6
−0
Conversation
This file contains hidden or 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
tomchy
approved these changes
Oct 2, 2025
ahasztag
force-pushed
the
NCSDK-35662_test_bootloader_mcuboot_boot_loop_fix
branch
2 times, most recently
from
2cf7e8f to
a5ac443
Compare
ahasztag
force-pushed
the
NCSDK-35662_test_bootloader_mcuboot_boot_loop_fix
branch
from
a5ac443 to
37164f9
Compare
…platforms The swapped_app image, added via ExternalZephyrProject_Add, wasn't receiving the swap method configuration from sysbuild. If trying to build the test with a different configuration that SWAP_USING_OFFSET (for example SWAP_USING_MOVE) this resulted in a boot loop due to configuration mismatch between swapped_image and mcuboot. This fix ensures proper configuration propagation and prevents similar mismatches in future scenarios. Signed-off-by: Artur Hadasz <[email protected]> (cherry picked from commit 7c1721de03bfbfe102817de415076d998a3516aa)
ahasztag
force-pushed
the
NCSDK-35662_test_bootloader_mcuboot_boot_loop_fix
branch
from
37164f9 to
185cebc
Compare
adsz-nordic
approved these changes
Oct 7, 2025
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.
…platforms
Nordic platforms default to SWAP_USING_MOVE configuration. The swapped_app image, added via ExternalZephyrProject_Add, wasn't receiving the swap method configuration from sysbuild, resulting in a boot loop due to configuration mismatch between swapped_image and mcuboot.
This fix ensures proper configuration propagation and prevents similar mismatches in future scenarios.
Upstream PR #: 96921