Move img_mgmt.c file #25379
Draft
Move img_mgmt.c file #25379
+1,184
−1
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
manifest
changelog-entry-required
There was a problem hiding this comment.
Pull Request Overview
This PR moves image management functionality from the upstream Zephyr repository to NRF-specific implementations by introducing new MCUmgr image management group files and updating the Zephyr revision.
- Creates an alternative implementation of MCUmgr image management functionality with Nordic-specific features
- Adds configuration options to enable the extended image management implementation
- Updates the Zephyr SDK revision to incorporate related changes
Reviewed Changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| west.yml | Updates Zephyr revision to pull/3460/head |
| subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c | Adds new image management state handling implementation |
| subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | Adds new image management core implementation |
| subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig | Adds configuration options for Nordic-specific image management |
| subsys/mgmt/mcumgr/grp/img_mgmt/CMakeLists.txt | Adds build configuration for image management files |
| subsys/mgmt/mcumgr/grp/Kconfig | Includes image management Kconfig in build |
| subsys/mgmt/mcumgr/grp/CMakeLists.txt | Includes image management subdirectory in build |
| scripts/ci/license_allow_list.yaml | Adds license exception for new source file |
| samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj_requests.conf | Enables Nordic image management in sample |
| samples/dfu/ab/prj.conf | Enables Nordic image management and removes BT controller config |
| modules/mcuboot/Kconfig | Adds boot request configuration options and implies Nordic image management |
Comments suppressed due to low confidence (2)
modules/mcuboot/Kconfig:1
- Missing semicolon at the end of the function call statement. This will cause a compilation error.
menu "MCUboot"
samples/dfu/ab/prj.conf:1
- The removal of CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 should be documented or explained as it may affect Bluetooth performance. Consider adding a comment explaining why this configuration is no longer needed.
# Enable MCUmgr and dependencies.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
The following west manifest projects have changed revision in this Pull Request:
⛔ DNM label due to: 1 project with PR revision Note: This message is automatically posted and updated by the Manifest GitHub Action. |
CI InformationTo view the history of this post, click the 'edited' button above Inputs:Sources:more detailsGithub labels
List of changed files detected by CI (0)Outputs:ToolchainVersion: Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped;
|
tomchy
force-pushed
the
bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions
branch
from
1204a8c to
393e3f8
Compare
|
You can find the documentation preview for this PR here. |
Add a copy of the img_mgmt.c file, so it can be adjusted to work with all NCS-specific extensions. Zephyr revision: 25269118b5069ebb72316d2a26bdedbe6ba8de95 Signed-off-by: Tomasz Chyrowicz <[email protected]>
Adds handling code to allow selecting the correct image slot when using QSPI XIP in DirectXIP mode In case of Direct XIP and multiple images, the radio active slot changes accordingly (i.e. application slot 1 boots radio slot 1). Moved from sdk-zephyr commit: 0fb761832466933b322fb8030c9ec934b62aa128 Signed-off-by: Jamie McCrae <[email protected]> Signed-off-by: Tomasz Chyrowicz <[email protected]>
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 Moved from sdk-zephyr commit: e6d6cc0c6ada8c69a021c5bbc13f52831c7c53a3 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Tomasz Chyrowicz <[email protected]>
tomchy
force-pushed
the
bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions
branch
from
393e3f8 to
dc5a11b
Compare
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig:1
- Missing 'CONFIG_' prefix. Should be 'CONFIG_MCUMGR_GRP_IMG_TOO_LARGE_BOOTLOADER_INFO' to properly reference the configuration option.
#
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
|
||
| ARG_UNUSED(area_sizes); | ||
|
|
||
| rc = blinfo_lookup(BLINFO_MAX_APPLICATION_SIZE, &max_app_size, sizeof(max_app_size)) |
There was a problem hiding this comment.
Missing semicolon at the end of the function call statement.
Suggested change
| rc = blinfo_lookup(BLINFO_MAX_APPLICATION_SIZE, &max_app_size, sizeof(max_app_size)) | |
| rc = blinfo_lookup(BLINFO_MAX_APPLICATION_SIZE, &max_app_size, sizeof(max_app_size)); |
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.
No description provided.