component: Update TF-M to main, with Corstone-320

Signed-off-by: Gergely Korcsák <[email protected]>

Author: gergelykarm

components/security/trusted_firmware-m/integration/CMakeLists.txt

@@ -43,7 +43,7 @@ if(APPLICATION_PATH MATCHES ".*blinky")
     # the exported library `psa_crypto_config` is not used by the non-secure side and these definitions are missing.
     target_compile_definitions(tfm-ns-interface-mbedtls-config
         INTERFACE
-            MBEDTLS_CONFIG_FILE="${trusted_firmware-m_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default_client.h"
+            MBEDTLS_CONFIG_FILE="${trusted_firmware-m_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_client.h"
             MBEDTLS_PSA_CRYPTO_CONFIG_FILE="${trusted_firmware-m_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/crypto_config_default.h"
     )
 else()

components/security/trusted_firmware-m/integration/cmake/MergeTfmImages.cmake

@@ -44,7 +44,7 @@ function(iot_reference_arm_corstone3xx_tf_m_merge_images target)
                     $<TARGET_FILE_DIR:${target}>/${target}_signed.bin -Binary -offset ${NS_IMAGE_LOAD_ADDRESS}
                     ${ddr_binary_param}
                     ${ns_provisioning_data_param}
-                    ${BINARY_DIR}/api_ns/bin/encrypted_provisioning_bundle.bin -Binary -offset ${S_PROVISIONING_BUNDLE_LOAD_ADDRESS}
+                    ${BINARY_DIR}/api_ns/bin/provisioning_bundle.bin -Binary -offset ${S_PROVISIONING_BUNDLE_LOAD_ADDRESS}
                     -o $<TARGET_FILE_DIR:${target}>/${target}_merged.hex
             COMMAND
                 ${objcopy} -I ihex -O elf32-little

components/security/trusted_firmware-m/library

@@ -25,7 +25,7 @@ dependencies:
     license: "BSD-3-Clause"
     tpip-category: "category-2"
     security-risk: "high"
-    version: "TF-Mv2.1.0"
+    version: "c9352b59f2a501b5af3f648b3fc91065993c002f"
     repository:
       type: "git"
       url: "https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git"