Skip to content

mgmt: Handle bootloader requests #25255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 3, 2025
Merged

mgmt: Handle bootloader requests #25255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2398b10
mcuboot: Move boot preference Kconfig
tomchy Oct 27, 2025
bd9bc00
mcumgr: Add a copy of image management state
tomchy Nov 3, 2025
f305f87
mgmt: Handle pending slot requests
tomchy Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modules/mcuboot/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ endmenu

config NRF_MCUBOOT_BOOT_REQUEST
bool "MCUboot bootloader requests"
imply MCUMGR_GRP_IMG_NRF
help
Handle bootloader requests.

Expand All @@ -101,4 +102,15 @@ config NRF_MCUBOOT_BOOT_REQUEST_IMPL_RETENTION

endchoice

config NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE
bool "Set boot preference if a slot is marked for test"
help
This option allows to verify boot preference requests through issuing
the image test.
Using this option is not recommended in production systems, because
it will boot any newly transferred image, even if it has a lower
version than the current one.
The rollback protection (using security counters) will still be
effective.

endif # NRF_MCUBOOT_BOOT_REQUEST
2 changes: 1 addition & 1 deletion samples/dfu/ab/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ CONFIG_STATS_NAMES=y
CONFIG_FLASH=y
CONFIG_IMG_MANAGER=y
CONFIG_MCUMGR_GRP_IMG=y
CONFIG_MCUMGR_GRP_IMG_NRF=y
CONFIG_MCUMGR_GRP_OS=y
CONFIG_MCUMGR_GRP_STAT=y

Expand Down Expand Up @@ -60,7 +61,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT_L2CAP_TX_MTU=498
CONFIG_BT_BUF_ACL_RX_SIZE=502
CONFIG_BT_BUF_ACL_TX_SIZE=502
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251

# Enable the Bluetooth mcumgr transport (unauthenticated).
CONFIG_MCUMGR_TRANSPORT_BT=y
Expand Down
1 change: 1 addition & 0 deletions samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj_requests.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ CONFIG_STATS_NAMES=y
CONFIG_FLASH=y
CONFIG_IMG_MANAGER=y
CONFIG_MCUMGR_GRP_IMG=y
CONFIG_MCUMGR_GRP_IMG_NRF=y
CONFIG_MCUMGR_GRP_OS=y
CONFIG_MCUMGR_GRP_STAT=y

Expand Down
1 change: 1 addition & 0 deletions scripts/ci/license_allow_list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Apache-2.0: |
^nrf/tests/benchmarks/kernel_freq_change/src/kernel_context.c
^nrf/tests/subsys/suit/common/tls_config/user-tls-conf.h
^nrf/subsys/settings/
^nrf/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
^nrf/tests/zephyr/subsys/settings/
^nrf/samples/zephyr/
curl: "^nrf/ext/"
Expand Down
1 change: 1 addition & 0 deletions subsys/mgmt/mcumgr/grp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
#

add_subdirectory_ifdef(CONFIG_MCUMGR_GRP_OS os_mgmt)
add_subdirectory_ifdef(CONFIG_MCUMGR_GRP_IMG img_mgmt)
1 change: 1 addition & 0 deletions subsys/mgmt/mcumgr/grp/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
menu "Additional MCUmgr group configuration"

rsource "os_mgmt/Kconfig"
rsource "img_mgmt/Kconfig"

endmenu
18 changes: 18 additions & 0 deletions subsys/mgmt/mcumgr/grp/img_mgmt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# Copyright (c) 2025 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

if(CONFIG_MCUMGR_GRP_IMG_NRF)
zephyr_library_amend()
zephyr_library_sources(
src/img_mgmt_state.c
)

set_source_files_properties(
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
DIRECTORY ${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/
PROPERTIES HEADER_FILE_ONLY ON
)
endif()
16 changes: 16 additions & 0 deletions subsys/mgmt/mcumgr/grp/img_mgmt/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# Copyright (c) 2025 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

menu "Additional MCUmgr image management group functionality"

config MCUMGR_GRP_IMG_NRF
bool "Use an extended version of the image management implementation"
depends on MCUMGR_GRP_IMG
help
Enables use of an extended version of the image management implementation that adds
Nordic-specific functionalities.

endmenu
Loading
Loading