diff --git a/cmake/sysbuild/image_signing.cmake b/cmake/sysbuild/image_signing.cmake index 5398a4544c01..8cde2f80fc97 100644 --- a/cmake/sysbuild/image_signing.cmake +++ b/cmake/sysbuild/image_signing.cmake @@ -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. diff --git a/cmake/sysbuild/image_signing_firmware_loader.cmake b/cmake/sysbuild/image_signing_firmware_loader.cmake index 9a9f15090dd2..f8b1b0367c1f 100644 --- a/cmake/sysbuild/image_signing_firmware_loader.cmake +++ b/cmake/sysbuild/image_signing_firmware_loader.cmake @@ -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. diff --git a/cmake/sysbuild/image_signing_split.cmake b/cmake/sysbuild/image_signing_split.cmake index d91b6afa3f9d..acdffbf79b1e 100644 --- a/cmake/sysbuild/image_signing_split.cmake +++ b/cmake/sysbuild/image_signing_split.cmake @@ -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. diff --git a/cmake/sysbuild/sign_nrf54h20.cmake b/cmake/sysbuild/sign_nrf54h20.cmake index 94ab9d078f5e..3c5bb0b439b0 100644 --- a/cmake/sysbuild/sign_nrf54h20.cmake +++ b/cmake/sysbuild/sign_nrf54h20.cmake @@ -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) diff --git a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj.conf b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj.conf index 925ac0c93a27..cb0cbf076379 100644 --- a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj.conf +++ b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj.conf @@ -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" diff --git a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/ipc_radio.conf b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/ipc_radio.conf new file mode 100644 index 000000000000..85ae6040c56a --- /dev/null +++ b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/ipc_radio.conf @@ -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" diff --git a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot.conf b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot.conf new file mode 100644 index 000000000000..36bb0f9a8265 --- /dev/null +++ b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot.conf @@ -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"