Skip to content

Add vendor and image class UUID support #23609

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 2 commits into from
Sep 15, 2025
Merged

Add vendor and image class UUID support #23609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caee516
sample: Enable VID and CID checks
tomchy Jul 31, 2025
3a5fd74
cmake: Handle VID and CID in NCS
tomchy Sep 12, 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
8 changes: 8 additions & 0 deletions cmake/sysbuild/image_signing.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ function(zephyr_mcuboot_tasks)
set(imgtool_extra -k "${keyfile}" ${imgtool_extra})
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_VID)
set(imgtool_extra ${imgtool_extra} --vid "${CONFIG_MCUBOOT_IMGTOOL_UUID_VID_NAME}")
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_CID)
set(imgtool_extra ${imgtool_extra} --cid "${CONFIG_MCUBOOT_IMGTOOL_UUID_CID_NAME}")
endif()

set(imgtool_args ${imgtool_extra})

# Extensionless prefix of any output file.
Expand Down
8 changes: 8 additions & 0 deletions cmake/sysbuild/image_signing_firmware_loader.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ function(zephyr_mcuboot_tasks)
set(imgtool_extra -k "${keyfile}" ${imgtool_extra})
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_VID)
set(imgtool_extra ${imgtool_extra} --vid "${CONFIG_MCUBOOT_IMGTOOL_UUID_VID_NAME}")
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_CID)
set(imgtool_extra ${imgtool_extra} --cid "${CONFIG_MCUBOOT_IMGTOOL_UUID_CID_NAME}")
endif()

set(imgtool_args ${imgtool_extra})

# Extensionless prefix of any output file.
Expand Down
8 changes: 8 additions & 0 deletions cmake/sysbuild/image_signing_split.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ function(zephyr_mcuboot_tasks)
set(imgtool_extra -k "${keyfile}" ${imgtool_extra})
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_VID)
set(imgtool_extra ${imgtool_extra} --vid "${CONFIG_MCUBOOT_IMGTOOL_UUID_VID_NAME}")
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_CID)
set(imgtool_extra ${imgtool_extra} --cid "${CONFIG_MCUBOOT_IMGTOOL_UUID_CID_NAME}")
endif()

set(imgtool_args ${imgtool_extra})

# Extensionless prefix of any output file.
Expand Down
14 changes: 14 additions & 0 deletions cmake/sysbuild/sign_nrf54h20.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@ function(mcuboot_sign_merged_nrf54h20 merged_hex main_image)
set(imgtool_args)
endif()

# Fetch VID and CID values from the main image Kconfig.
set(CONFIG_MCUBOOT_IMGTOOL_UUID_VID)
set(CONFIG_MCUBOOT_IMGTOOL_UUID_CID)
sysbuild_get(CONFIG_MCUBOOT_IMGTOOL_UUID_VID IMAGE ${main_image} VAR CONFIG_MCUBOOT_IMGTOOL_UUID_VID KCONFIG)
sysbuild_get(CONFIG_MCUBOOT_IMGTOOL_UUID_CID IMAGE ${main_image} VAR CONFIG_MCUBOOT_IMGTOOL_UUID_CID KCONFIG)

if(CONFIG_MCUBOOT_IMGTOOL_UUID_VID)
set(imgtool_extra ${imgtool_extra} --vid "${CONFIG_MCUBOOT_IMGTOOL_UUID_VID_NAME}")
endif()

if(CONFIG_MCUBOOT_IMGTOOL_UUID_CID)
set(imgtool_extra ${imgtool_extra} --cid "${CONFIG_MCUBOOT_IMGTOOL_UUID_CID_NAME}")
endif()

# Fetch version and flags from the main image Kconfig.
set(CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION)
set(CONFIG_MCUBOOT_GENERATE_CONFIRMED_IMAGE)
Expand Down
5 changes: 5 additions & 0 deletions samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,8 @@ CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y

# Disable debug logging
CONFIG_LOG_MAX_LEVEL=3

CONFIG_MCUBOOT_IMGTOOL_UUID_VID=y
CONFIG_MCUBOOT_IMGTOOL_UUID_VID_NAME="nordicsemi.com"
CONFIG_MCUBOOT_IMGTOOL_UUID_CID=y
CONFIG_MCUBOOT_IMGTOOL_UUID_CID_NAME="nRF54H20_sample_app"
4 changes: 4 additions & 0 deletions samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/ipc_radio.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONFIG_MCUBOOT_IMGTOOL_UUID_VID=y
CONFIG_MCUBOOT_IMGTOOL_UUID_VID_NAME="nordicsemi.com"
CONFIG_MCUBOOT_IMGTOOL_UUID_CID=y
CONFIG_MCUBOOT_IMGTOOL_UUID_CID_NAME="nRF54H20_sample_rad"
6 changes: 6 additions & 0 deletions samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CONFIG_MCUBOOT_UUID_VID=y
CONFIG_NCS_MCUBOOT_UUID_VID_VALUE="nordicsemi.com"

CONFIG_MCUBOOT_UUID_CID=y
CONFIG_NCS_MCUBOOT_UUID_CID_IMAGE_0_VALUE="nRF54H20_sample_app"
CONFIG_NCS_MCUBOOT_UUID_CID_IMAGE_1_VALUE="nRF54H20_sample_rad"