NCSDK-35612: Fix offsets in the merged slot builds #3310
+38
−22
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
Open
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
6 times, most recently
from
00efa4f to
d67321a
Compare
…ion" This reverts commit 28efd42. Sgned-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
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. Upstream PR #: 96925 Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
from
d67321a to
5f4afb5
Compare
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. Upstream PR #: 96925 Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
from
5f4afb5 to
81f4259
Compare
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 <Marek.Pieta@nordicsemi.no> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no> (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 <tomasz.chyrowicz@nordicsemi.no>
tomchy
force-pushed
the
bugfix/mcuboot/NCSDK-35612_Fix_merged_slot_offsets
branch
from
81f4259 to
6f16451
Compare
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.
No description provided.