Move img_mgmt.c file #25379

tomchy · 2025-11-03T13:15:22Z

No description provided.

Copilot

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.

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

NordicBuilder · 2025-11-03T13:16:02Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@`b5cf3ea`	nrfconnect/sdk-zephyr@`39f9f79` (`main`)	nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

NordicBuilder · 2025-11-03T13:20:25Z

CI Information

^{To view the history of this post, click the 'edited' button above}
Build number: 22

Inputs:

Sources:

sdk-nrf: PR head: b09aca845f7e154ffae1c612832fc07a783c1a69
zephyr: PR head: 39f9f799bedb38a8216312c72fc605581b85480f

more details

sdk-nrf:

PR head: b09aca845f7e154ffae1c612832fc07a783c1a69
merge base: 663d32357473c5ecf73944df89d81f6bc49d6934
target head (main): 295b4cf34e6b7bb191fe31f0217ec14dcbb6ab83
Diff

zephyr:

PR head: 39f9f799bedb38a8216312c72fc605581b85480f
merge base: b5cf3eaf422232176fe4eb00201c811647e8aa64
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (9)

scripts
│  ├── ci
│  │  │ license_allow_list.yaml
subsys
│  ├── mgmt
│  │  ├── mcumgr
│  │  │  ├── grp
│  │  │  │  ├── img_mgmt
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ img_mgmt.c
sysbuild
│  │ CMakeLists.txt
west.yml
zephyr
│  ├── dts
│  │  ├── arm
│  │  │  ├── nordic
│  │  │  │  │ nrf54lm20a_enga_cpuapp.dtsi
│  ├── subsys
│  │  ├── mgmt
│  │  │  ├── mcumgr
│  │  │  │  ├── grp
│  │  │  │  │  ├── img_mgmt
│  │  │  │  │  │  ├── Kconfig
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ img_mgmt.c

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain
◻️ Build twister
◻️ Integration tests
- ◻️ test-sdk-audio
- ◻️ desktop52_verification
- ◻️ test-fw-nrfconnect-apps
- ◻️ test_ble_nrf_config
- ◻️ test-fw-nrfconnect-ble_mesh
- ◻️ test-fw-nrfconnect-ble_samples
- ◻️ test-fw-nrfconnect-chip
- ◻️ test-fw-nrfconnect-nfc
- ◻️ test-fw-nrfconnect-nrf-iot_libmodem-nrf
- ◻️ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- ◻️ test-fw-nrfconnect-nrf-iot_samples
- ◻️ test-fw-nrfconnect-nrf-iot_lwm2m
- ◻️ test-fw-nrfconnect-nrf-iot_thingy91
- ◻️ test-fw-nrfconnect-nrf_crypto
- ◻️ test-fw-nrfconnect-rpc
- ◻️ test-fw-nrfconnect-rs
- ◻️ test-fw-nrfconnect-fem
- ◻️ test-fw-nrfconnect-tfm
- ◻️ test-fw-nrfconnect-thread-main
- ◻️ test-sdk-find-my
- ◻️ test-fw-nrfconnect-nrf_lrcs_positioning
- ◻️ test-sdk-wifi
- ◻️ test-low-level
- ◻️ test-sdk-mcuboot
- ◻️ test-sdk-dfu
- ◻️ test-fw-nrfconnect-ps-main
- ◻️ test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

github-actions · 2025-11-03T14:07:12Z

You can find the documentation preview for this PR here.

Copilot

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.

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

Copilot

Pull Request Overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

Copilot

Pull Request Overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

Copilot

Pull Request Overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

NordicBuilder · 2025-11-07T13:33:12Z

Memory footprint analysis revealed the following potential issues

applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 12744[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 9492[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 9102[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 5858[B] - link (cc: @nrfconnect/ncs-ll-ursus)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-25379/19)

Copilot

Pull Request Overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig

Copilot

Pull Request Overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

Copilot

Pull Request Overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

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]>

Fix a few typos, that were found during review. Signed-off-by: Tomasz Chyrowicz <[email protected]>

Copilot AI review requested due to automatic review settings November 3, 2025 13:15

NordicBuilder added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Nov 3, 2025

Copilot AI reviewed Nov 3, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c Outdated Show resolved Hide resolved

NordicBuilder added manifest-zephyr DNM labels Nov 3, 2025

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 1204a8c to 393e3f8 Compare November 3, 2025 13:26

Copilot AI review requested due to automatic review settings November 4, 2025 15:47

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 393e3f8 to dc5a11b Compare November 4, 2025 15:47

Copilot AI reviewed Nov 4, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c Outdated Show resolved Hide resolved

tomchy marked this pull request as ready for review November 6, 2025 16:29

tomchy requested review from a team as code owners November 6, 2025 16:29

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from dc5a11b to 124a251 Compare November 6, 2025 16:30

Copilot AI review requested due to automatic review settings November 7, 2025 08:23

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 124a251 to 56d1074 Compare November 7, 2025 08:23

Copilot AI reviewed Nov 7, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c Outdated Show resolved Hide resolved

Copilot AI review requested due to automatic review settings November 7, 2025 08:51

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 12e97de to 5cab710 Compare November 7, 2025 08:51

Copilot AI reviewed Nov 7, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c Outdated Show resolved Hide resolved

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 5cab710 to fb91566 Compare November 7, 2025 09:11

nordicjm reviewed Nov 7, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig Outdated Show resolved Hide resolved

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c Show resolved Hide resolved

tomchy requested review from Copilot and nordicjm November 7, 2025 11:51

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from fb91566 to f55727f Compare November 7, 2025 11:59

Copilot AI reviewed Nov 7, 2025

View reviewed changes

ahasztag approved these changes Nov 7, 2025

View reviewed changes

nordicjm approved these changes Nov 7, 2025

View reviewed changes

adsz-nordic approved these changes Nov 7, 2025

View reviewed changes

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from f55727f to 75977ff Compare November 10, 2025 09:14

NordicBuilder removed the DNM label Nov 10, 2025

Copilot AI review requested due to automatic review settings November 10, 2025 15:04

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 75977ff to 6d48b6b Compare November 10, 2025 15:04

Copilot AI reviewed Nov 10, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig Show resolved Hide resolved

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 6d48b6b to f8b1032 Compare November 10, 2025 17:09

Copilot AI review requested due to automatic review settings November 11, 2025 13:31

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from f8b1032 to f047c08 Compare November 11, 2025 13:31

Copilot AI reviewed Nov 11, 2025

View reviewed changes

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c Show resolved Hide resolved

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from f047c08 to bd313a3 Compare November 12, 2025 08:21

NordicBuilder added the DNM label Nov 12, 2025

Copilot AI review requested due to automatic review settings November 12, 2025 08:38

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from bd313a3 to 3ee02e6 Compare November 12, 2025 08:38

Copilot AI reviewed Nov 12, 2025

View reviewed changes

rlubos mentioned this pull request Nov 12, 2025

manifest: sdk-zephyr: [nrf fromlist] dts: nrf54lm20a: align GPIOTE IRQn to non-secure build #25535

Closed

tomchy added 4 commits November 12, 2025 14:47

mcumgr: Add a copy of image management lib

1556a01

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]>

mcumgr: img_mgmt: Fix minor issues

b09aca8

Fix a few typos, that were found during review. Signed-off-by: Tomasz Chyrowicz <[email protected]>

tomchy force-pushed the bugfix/mcumgr/NCSDK-NONE_Move_ncs_extensions branch from 3ee02e6 to b09aca8 Compare November 12, 2025 13:47

NordicBuilder removed the DNM label Nov 12, 2025

rlubos merged commit 78eb1cb into nrfconnect:main Nov 12, 2025
23 of 24 checks passed

Move img_mgmt.c file #25379

Move img_mgmt.c file #25379

Uh oh!

Conversation

tomchy commented Nov 3, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

NordicBuilder commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NordicBuilder commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

Uh oh!

github-actions bot commented Nov 3, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

NordicBuilder commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Memory footprint analysis revealed the following potential issues

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

NordicBuilder commented Nov 3, 2025 •

edited

Loading

NordicBuilder commented Nov 3, 2025 •

edited

Loading

NordicBuilder commented Nov 7, 2025 •

edited

Loading