single_slot: Remove default overlay #26153
Open
+31
−10
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
NordicBuilder
added
the
changelog-entry-required
The default overlay for FW loader sets code-partition to slot1_partition, which stays with direct conflict with the merged slot approach: - slot1_partition must point to the merged partition to allow SMP logic to parse the FW loader magic & version - if FW loader indeed uses slot1_partition with ROM_START_OFFSET, than it is impossible to correctly boot the radio core FW, since it cannot use the same value of the ROM_START_OFFSET (2kB NVM waste) and there is no way to tell the FW loader code in soc.c to boot the radio with a different value of ROM_START_OFFSET. - the size of the code-partition must be different from the size of the partition parsed by the SMP, so there is a protection against potential code partition overflow and the flash area API can reach past the code partition area. One solution would be to change the contents of the FIRMWARE_LOADER_image_default.overlay, but since it would force every user of the FW loader within Zephyr to add a new partition alias, it is far less intrusive to remove this overlay from sysbuild.cmake script in those samples, that use merged slot approach. Ref: NCSDK-36779 Signed-off-by: Tomasz Chyrowicz <[email protected]>
There was a problem hiding this comment.
Pull request overview
This PR addresses conflicts between the default firmware loader overlay and the merged slot approach used in the single_slot DFU sample. The main issue is that the default overlay sets code-partition to slot1_partition, which conflicts with the merged slot approach where slot1_partition must point to the merged partition for SMP logic to work correctly.
Key Changes:
- Removes the default overlay for firmware loader images when using merged binary signing
- Updates overlay files to directly set
zephyr,code-partitioninstead of manipulatingslot1_partition
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| samples/dfu/single_slot/sysbuild.cmake | Adds logic to remove default overlay when SB_CONFIG_MCUBOOT_SIGN_MERGED_BINARY is enabled |
| samples/dfu/single_slot/sysbuild/fw_loader_ipc_radio.overlay | Replaces node deletion/redefinition with direct zephyr,code-partition assignment |
| samples/dfu/single_slot/sysbuild/ble_mcumgr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay | Replaces node deletion/redefinition with direct zephyr,code-partition assignment |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| FirmwareUpdaterImage_Get(fw_loader_images) | ||
| foreach(image IN LISTS fw_loader_images) | ||
| # Remove the default overlay file. | ||
| set(${image}_EXTRA_DTC_OVERLAY_FILE "" CACHE INTERNAL "Application extra DTC overlay file" |
There was a problem hiding this comment.
The comment 'Application extra DTC overlay file' should be 'Image extra DTC overlay file' since this is setting the overlay for firmware loader images, not the application.
Suggested change
| set(${image}_EXTRA_DTC_OVERLAY_FILE "" CACHE INTERNAL "Application extra DTC overlay file" | |
| set(${image}_EXTRA_DTC_OVERLAY_FILE "" CACHE INTERNAL "Image extra DTC overlay file" |
tomchy
force-pushed
the
bugfix/single_slot/NCSDK-NONE_Fix_fw_loader_partitions
branch
from
d17065a to
5ddb364
Compare
Contributor
CI InformationTo view the history of this post, click the 'edited' button above Inputs:Sources:sdk-nrf: PR head: 5ddb3640f5addef216034ef67e4fb876429a5edd more detailssdk-nrf:
Github labels
List of changed files detected by CI (3)Outputs:ToolchainVersion: 43683a87ea Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
The default overlay for FW loader sets code-partition to slot1_partition, which stays with direct conflict with the merged slot approach:
One solution would be to change the contents of the FIRMWARE_LOADER_image_default.overlay, but since it would force every user of the FW loader within Zephyr to add a new partition alias, it is far less intrusive to remove this overlay from sysbuild.cmake script in those samples, that use merged slot approach.
Ref: NCSDK-36779