NCSDK-35612: Fix offsets in the merged slot builds #3310
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
changed the title
This was referenced Sep 25, 2025
Closed
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
9 times, most recently
from
81f4259 to
6f16451
Compare
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
3 times, most recently
from
f9e008c to
589148c
Compare
nordicjm
approved these changes
Oct 10, 2025
nvlsianpu
approved these changes
Oct 10, 2025
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
from
589148c to
1d07eb6
Compare
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
2 times, most recently
from
672f25c to
52fb986
Compare
The DT_MTD_FROM_FIXED_SUBPARTITION must go one level more than the DT_MTD_FROM_FIXED_PARTITION counterpart. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit e4ecd4b290f98f5fde68f0ce6fea4a61a74ecf2d)
Currently the DT_FIXED_PARTITION_ADDR as well as DT_FIXED_SUBPARTITION_ADDR works only for partitions under the soc,nv-flash -compatible nodes. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 5c010ed9a31dc99ba5f955c989ee00136b89a921)
Allow to use both partition and subpartition names when suing the flash_map API. That way it is possible to introduce a hierarchy within DTS in a backward compatible way. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 3ae8a4366785f8cedf794dbae1cb889ee4830ff3)
…ion" This reverts commit 28efd42. Signed-off-by: Tomasz Chyrowicz <[email protected]>
Use cpuapp_slot_partition instead of slot0_partition, so it is possible to add MCUboot header through --pad-header option. In such cases, the FLASH_LOAD_OFFSET does not point to the begining of the slot, but to the beginning of the executable area, thus the check for the active slot should use ranges instead of exact values. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 14af165)
It is possible to add MCUboot header through --pad-header option. In such cases, the FLASH_LOAD_OFFSET does not point to the beginning of the slot, but to the beginning of the executable area, thus the check for the active slot should use ranges instead of exact values. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 3261569)
The "zephyr-code-partition" chosen DTS node cannot be used when build uses Partition Manager. In that case, mcumgr must rely on the definitions provided by the Partition Manager. Jira: NCSDK-21381 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 6b04cee)
In the merged slot approach, the memory reservation for the MCUboot header is done in CMake, as it is not obvious, which image includes the (merged) MCUboot header. This change will remove the unnecessary gap between images. Ref: NCSDK-35612 Signed-off-by: Tomasz Chyrowicz <[email protected]>
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
from
52fb986 to
66b1e48
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
manifest-pr-skip