align to OTA suit

Author: ArekBalysNordic

config/nrfconnect/chip-module/Kconfig

@@ -60,8 +60,8 @@ config CHIP_OTA_REQUESTOR
 	bool
 	imply DFU_MULTI_IMAGE
 	imply DFU_TARGET
-	imply BOOTLOADER_MCUBOOT
-	imply IMG_MANAGER
+	imply BOOTLOADER_MCUBOOT if !CHIP_SUIT
+	imply IMG_MANAGER if !CHIP_SUIT
 	imply STREAM_FLASH
 	imply STREAM_FLASH_ERASE
 

config/nrfconnect/chip-module/Kconfig.defaults

@@ -214,6 +214,7 @@ config BOOT_IMAGE_ACCESS_HOOKS
 config UPDATEABLE_IMAGE_NUMBER
     default 3 if NRF_WIFI_PATCHES_EXT_FLASH_STORE
     default 2 if SOC_SERIES_NRF53X
+    default 1 if SUIT
 
 config DFU_MULTI_IMAGE_MAX_IMAGE_COUNT
     default 3 if NRF_WIFI_PATCHES_EXT_FLASH_STORE

config/zephyr/ota-image.cmake

@@ -30,6 +30,13 @@ function(chip_ota_image TARGET_NAME)
         message(FATAL_ERROR "Both INPUT_FILES and OUTPUT_FILE arguments must be specified")
     endif()
 
+    if(SYSBUILD)
+        sysbuild_get(CONFIG_CHIP_DEVICE_SOFTWARE_VERSION IMAGE ${DEFAULT_IMAGE} VAR CONFIG_CHIP_DEVICE_SOFTWARE_VERSION KCONFIG)
+        sysbuild_get(CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING IMAGE ${DEFAULT_IMAGE} VAR CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING KCONFIG)
+        sysbuild_get(CONFIG_CHIP_DEVICE_VENDOR_ID IMAGE ${DEFAULT_IMAGE} VAR CONFIG_CHIP_DEVICE_VENDOR_ID KCONFIG)
+        sysbuild_get(CONFIG_CHIP_DEVICE_PRODUCT_ID IMAGE ${DEFAULT_IMAGE} VAR CONFIG_CHIP_DEVICE_PRODUCT_ID KCONFIG)
+    endif()
+
     # Prepare ota_image_tool.py argument list
     if(DEFINED APPVERSION)
         set(OTA_ARGS
@@ -44,6 +51,33 @@ function(chip_ota_image TARGET_NAME)
             "--digest-algorithm"
             "sha256"
         )
+    elseif(EXISTS ${APP_DIR}/VERSION)
+        file(READ ${APP_DIR}/VERSION ver)
+        set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${APP_DIR}/VERSION)
+        string(REGEX MATCH "VERSION_MAJOR = ([0-9]*)" _ ${ver})
+        set(app_version_major ${CMAKE_MATCH_1})
+        string(REGEX MATCH "VERSION_MINOR = ([0-9]*)" _ ${ver})
+        set(app_version_minor ${CMAKE_MATCH_1})
+        string(REGEX MATCH "PATCHLEVEL = ([0-9]*)" _ ${ver})
+        set(app_version_patchlevel ${CMAKE_MATCH_1})
+        string(REGEX MATCH "VERSION_TWEAK = ([0-9]*)" _ ${ver})
+        set(app_version_tweak ${CMAKE_MATCH_1})
+    
+        set(APP_VERSION_STRING "${app_version_major}.${app_version_minor}.${app_version_patchlevel}+${app_version_tweak}")
+        math(EXPR APPVERSION "(${app_version_major} << 24) | (${app_version_minor} << 16) | (${app_version_patchlevel} << 8) | ${app_version_tweak}" OUTPUT_FORMAT HEXADECIMAL)
+    
+        set(OTA_ARGS
+            "--vendor-id"
+            ${CONFIG_CHIP_DEVICE_VENDOR_ID}
+            "--product-id"
+            ${CONFIG_CHIP_DEVICE_PRODUCT_ID}
+            "--version"
+            ${APPVERSION}
+            "--version-str"
+            ${APP_VERSION_STRING}
+            "--digest-algorithm"
+            "sha256"
+        )
     else()
         set(OTA_ARGS
             "--vendor-id"
@@ -74,9 +108,15 @@ function(chip_ota_image TARGET_NAME)
         CONTENT ${OTA_ARGS}
     )
 
+    if (CHIP_ROOT)
+        set(CONNECTEDHOMEIP_ROOT ${CHIP_ROOT})
+    else()
+        set(CONNECTEDHOMEIP_ROOT ${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR})
+    endif()
+
     add_custom_command(OUTPUT ${ARG_OUTPUT_FILE}
-        COMMAND ${Python3_EXECUTABLE} ${CHIP_ROOT}/src/app/ota_image_tool.py create @${ARG_OUTPUT_FILE}.args
-        DEPENDS ${ARG_INPUT_FILES} ${CHIP_ROOT}/src/app/ota_image_tool.py
+        COMMAND ${Python3_EXECUTABLE} ${CONNECTEDHOMEIP_ROOT}/src/app/ota_image_tool.py create @${ARG_OUTPUT_FILE}.args
+        DEPENDS ${ARG_INPUT_FILES} ${CONNECTEDHOMEIP_ROOT}/src/app/ota_image_tool.py
     )
 
     add_custom_target(${TARGET_NAME} ALL

config/zephyr/ota-image_sysbuild.cmake

@@ -33,8 +33,12 @@
 
 #include <dfu/dfu_multi_image.h>
 #include <dfu/dfu_target.h>
+#ifdef CONFIG_BOOTLOADER_MCUBOOT
 #include <dfu/dfu_target_mcuboot.h>
 #include <zephyr/dfu/mcuboot.h>
+#elif defined(CONFIG_SUIT)
+#include <dfu/dfu_target_suit.h>
+#endif
 #include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
 
@@ -75,7 +79,11 @@ CHIP_ERROR OTAImageProcessorImpl::PrepareDownloadImpl()
 {
     mHeaderParser.Init();
     mParams = {};
+#ifdef CONFIG_BOOTLOADER_MCUBOOT
     ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_mcuboot_set_buf(mBuffer, sizeof(mBuffer))));
+#elif defined(CONFIG_SUIT)
+    ReturnErrorOnFailure(System::MapErrorZephyr(dfu_target_suit_set_buf(mBuffer, sizeof(mBuffer))));
+#endif
     ReturnErrorOnFailure(System::MapErrorZephyr(dfu_multi_image_init(mBuffer, sizeof(mBuffer))));
 
     for (int image_id = 0; image_id < CONFIG_UPDATEABLE_IMAGE_NUMBER; ++image_id)