ota-pal: Fix Image version getter and NS versioning

The image version using the following naming:
major.minor.patch.build

Patch actually is the image header's revision.

Signed-off-by: Dávid Házi <[email protected]>

Author: david-hazi-arm

applications/freertos_iot_libraries_tests/TfmInitialCache.cmake

@@ -11,6 +11,6 @@ set(MCUBOOT_IMAGE_NUMBER 2 CACHE STRING "MCUBOOT_IMAGE_NUMBER" FORCE)
 set(DEFAULT_MCUBOOT_FLASH_MAP ON CACHE BOOL "DEFAULT_MCUBOOT_FLASH_MAP" FORCE)
 set(MCUBOOT_DATA_SHARING ON CACHE BOOL "MCUBOOT_DATA_SHARING" FORCE)
 set(MCUBOOT_UPGRADE_STRATEGY "SWAP_USING_SCRATCH" CACHE STRING "MCUBOOT_UPGRADE_STRATEGY" FORCE)
-set(MCUBOOT_IMAGE_VERSION_NS "0.0.1+10" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
+set(MCUBOOT_IMAGE_VERSION_NS "0.0.10+0" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
 set(PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT ON CACHE BOOL "PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT" FORCE)
 set(TFM_PARTITION_FIRMWARE_UPDATE ON CACHE BOOL "TFM_PARTITION_FIRMWARE_UPDATE" FORCE)

applications/keyword_detection/CMakeLists.txt

@@ -31,12 +31,12 @@ set(AWS_OTA_SIGNATURE_TYPE  "RSA-3072" CACHE STRING "Supported algorithms for si
 # due to same firmware version.
 # We will therefore change the build version from TF-M.
 # MCUBOOT_IMAGE_VERSION_NS is passed to the TF-M build in TfmInitialCache.cmake
-set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.1+20")
+set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.20+0")
 
 # This variable is only defined in case of GNU toolchain as it is currently the only toolchain
 # that supports the ML Model component OTA update feature where this variable is needed.
 if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
-    set(MCUBOOT_IMAGE_VERSION_NS_ML_MODEL_UPDATE "0.0.1+42")
+    set(MCUBOOT_IMAGE_VERSION_NS_ML_MODEL_UPDATE "0.0.42+0")
 endif()
 
 if (${ML_INFERENCE_ENGINE} STREQUAL "ETHOS")

applications/keyword_detection/TfmInitialCache.cmake

@@ -7,7 +7,7 @@ include(${ROOT}/cmake/TfmInitialCacheCommon.cmake)
 set(TFM_MBEDCRYPTO_CONFIG_CLIENT_PATH "${ROOT}/applications/keyword_detection/configs/mbedtls_config/aws_mbedtls_config.h" CACHE FILEPATH "TFM_MBEDCRYPTO_CONFIG_CLIENT_PATH" FORCE)
 set(PROJECT_CONFIG_HEADER_FILE ${ROOT}/applications/keyword_detection/configs/tfm_config/project_config.h CACHE FILEPATH "PROJECT_CONFIG_HEADER_FILE" FORCE)
 set(MCUBOOT_UPGRADE_STRATEGY "SWAP_USING_SCRATCH" CACHE STRING "MCUBOOT_UPGRADE_STRATEGY" FORCE)
-set(MCUBOOT_IMAGE_VERSION_NS  "0.0.1+10" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
+set(MCUBOOT_IMAGE_VERSION_NS  "0.0.10+0" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
 set(CONFIG_TFM_HALT_ON_CORE_PANIC ON CACHE BOOL "CONFIG_TFM_HALT_ON_CORE_PANIC" FORCE)
 set(MCUBOOT_DATA_SHARING ON CACHE BOOL "MCUBOOT_DATA_SHARING" FORCE)
 set(PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT ON CACHE BOOL "PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT" FORCE)
@@ -19,7 +19,7 @@ set(CONFIG_TFM_ENABLE_MVE_FP ON CACHE STRING "CONFIG_TFM_ENABLE_MVE_FP" FORCE)
 # These variables are only defined in case of GNU toolchain as it is currently the only toolchain
 # that supports the ML Model component OTA update feature where these variables are needed.
 if (${TOOLCHAIN} STREQUAL "GNU")
-    set(MCUBOOT_IMAGE_VERSION_NS_ML_MODEL "0.0.1+11" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS_ML_MODEL" FORCE)
+    set(MCUBOOT_IMAGE_VERSION_NS_ML_MODEL "0.0.11+0" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS_ML_MODEL" FORCE)
     set(MCUBOOT_NS_ML_MODEL_IMAGE_FLASH_AREA_NUM "1_0" CACHE STRING "MCUBOOT_NS_ML_MODEL_IMAGE_FLASH_AREA_NUM" FORCE)
     set(MCUBOOT_SECURITY_COUNTER_NS_ML_MODEL 1 CACHE STRING "MCUBOOT_SECURITY_COUNTER_NS_ML_MODEL" FORCE)
     set(MCUBOOT_IMAGE_NUMBER 3 CACHE STRING "MCUBOOT_IMAGE_NUMBER" FORCE)

applications/object_detection/CMakeLists.txt

@@ -25,7 +25,7 @@ set(AWS_OTA_SIGNATURE_TYPE  "RSA-3072" CACHE STRING "Supported algorithms for si
 # due to same firmware version.
 # We will therefore change the build version from TF-M.
 # MCUBOOT_IMAGE_VERSION_NS is passed to the TF-M build in TfmInitialCache.cmake
-set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.1+20")
+set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.20+0")
 
 if (${ML_INFERENCE_ENGINE} STREQUAL "ETHOS")
     set(ETHOS_U_NPU_ENABLED ON)

applications/object_detection/TfmInitialCache.cmake

@@ -9,7 +9,7 @@ set(PROJECT_CONFIG_HEADER_FILE ${ROOT}/applications/object_detection/configs/tfm
 set(MCUBOOT_IMAGE_NUMBER 2 CACHE STRING "MCUBOOT_IMAGE_NUMBER" FORCE)
 set(DEFAULT_MCUBOOT_FLASH_MAP ON CACHE BOOL "DEFAULT_MCUBOOT_FLASH_MAP" FORCE)
 set(MCUBOOT_UPGRADE_STRATEGY "SWAP_USING_SCRATCH" CACHE STRING "MCUBOOT_UPGRADE_STRATEGY" FORCE)
-set(MCUBOOT_IMAGE_VERSION_NS "0.0.1+10" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
+set(MCUBOOT_IMAGE_VERSION_NS "0.0.10+0" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
 set(CONFIG_TFM_HALT_ON_CORE_PANIC ON CACHE BOOL "CONFIG_TFM_HALT_ON_CORE_PANIC" FORCE)
 set(MCUBOOT_DATA_SHARING ON CACHE BOOL "MCUBOOT_DATA_SHARING" FORCE)
 set(PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT ON CACHE BOOL "PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT" FORCE)

applications/speech_recognition/CMakeLists.txt

@@ -24,7 +24,7 @@ set(AWS_OTA_SIGNATURE_TYPE  "RSA-3072" CACHE STRING "Supported algorithms for si
 # Because of this, if only PATCH version is changed then the OTA will be rejected
 # due to same firmware version.
 # We will therefore change the build version from TF-M.
-set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.1+20")
+set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.20+0")
 
 if (${ML_INFERENCE_ENGINE} STREQUAL "ETHOS")
     set(ETHOS_U_NPU_ENABLED ON)

applications/speech_recognition/TfmInitialCache.cmake

@@ -10,7 +10,7 @@ set(PROJECT_CONFIG_HEADER_FILE ${ROOT}/applications/speech_recognition/configs/t
 set(MCUBOOT_IMAGE_NUMBER 2 CACHE STRING "MCUBOOT_IMAGE_NUMBER" FORCE)
 set(DEFAULT_MCUBOOT_FLASH_MAP ON CACHE BOOL "DEFAULT_MCUBOOT_FLASH_MAP" FORCE)
 set(MCUBOOT_UPGRADE_STRATEGY "SWAP_USING_SCRATCH" CACHE STRING "MCUBOOT_UPGRADE_STRATEGY" FORCE)
-set(MCUBOOT_IMAGE_VERSION_NS  "0.0.1+10" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
+set(MCUBOOT_IMAGE_VERSION_NS  "0.0.10+0" CACHE STRING "MCUBOOT_IMAGE_VERSION_NS" FORCE)
 set(CONFIG_TFM_HALT_ON_CORE_PANIC ON CACHE BOOL "CONFIG_TFM_HALT_ON_CORE_PANIC" FORCE)
 set(MCUBOOT_DATA_SHARING ON CACHE BOOL "MCUBOOT_DATA_SHARING" FORCE)
 set(PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT ON CACHE BOOL "PLATFORM_HAS_FIRMWARE_UPDATE_SUPPORT" FORCE)

components/security/freertos_ota_pal_psa/integration/patches/0004-app-version-Do-not-store-version-in-a-global-var.patch

@@ -29,15 +29,15 @@ index 7b38c6a..a44d284 100644
 @@ -33,24 +33,24 @@
  #include "FreeRTOS.h"
  #include "application_version.h"
- 
+
 -AppVersion32_t appFirmwareVersion;
 -
 -int GetImageVersionPSA( psa_fwu_component_t uxComponent )
 +int GetImageVersionPSA( psa_fwu_component_t uxComponent, AppVersion32_t *pxVersion )
  {
      psa_fwu_component_info_t xComponentInfo = { 0 };
      psa_status_t uxStatus;
- 
+
 +    configASSERT( pxVersion != NULL );
 +
      uxStatus = psa_fwu_query( uxComponent, &xComponentInfo );
@@ -48,7 +48,7 @@ index 7b38c6a..a44d284 100644
 -        appFirmwareVersion.u.x.build = (uint16_t)xComponentInfo.version.build;
 +        pxVersion->u.x.major = xComponentInfo.version.major;
 +        pxVersion->u.x.minor = xComponentInfo.version.minor;
-+        pxVersion->u.x.build = (uint16_t)xComponentInfo.version.build;
++        pxVersion->u.x.build = (uint16_t)xComponentInfo.version.patch;
          return 0;
      }
      else
@@ -64,7 +64,7 @@ index 7775910..fcd8b85 100644
 +++ b/version/application_version.h
 @@ -28,18 +28,17 @@
  #include "psa/update.h"
- 
+
  /**
 - * @brief Get the running image version of the given component.
 - *
@@ -91,8 +91,8 @@ index 7775910..fcd8b85 100644
 +* @return 0 on success and -1 on failure.
 +*/
 +int GetImageVersionPSA( psa_fwu_component_t uxComponent, AppVersion32_t *pxVersion );
- 
+
  #endif
--- 
+--
 2.34.1