Commit 186cd651 authored by Kevin Townsend's avatar Kevin Townsend Committed by Anas Nashif
Browse files

manifest: Update to TF-M 1.7.0 and MBedTLS 3.2.1 



Update TF-M from 1.6.0 to 1.7.0
Update MBedTLS from 3.1.0 to 3.2.1.

Updates the cmake wrapper for changes introduced in TF-M 1.7.0.

Signed-off-by: default avatarKevin Townsend <kevin.townsend@linaro.org>
Signed-off-by: default avatarJoakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: default avatarDavid Brown <david.brown@linaro.org>
parent 2572a53a

modules/trusted-firmware-m/CMakeLists.txt

+23 −21
Original line number Diff line number Diff line 
# Copyright (c) 2019, 2020 Linaro

# Copyright (c) 2020, 2021 Nordic Semiconductor ASA

# Copyright (c) 2019 - 2023 Linaro

# Copyright (c) 2020 - 2023 Nordic Semiconductor ASA

#

# SPDX-License-Identifier: Apache-2.0



# List of all partitions supported by TF-M

# Name must match name in 'trusted-firmware-m/config/config_default.cmake'

# Name must match name in 'trusted-firmware-m/tools/tfm_manifest_list.yaml'

set(TFM_VALID_PARTITIONS

  TFM_PARTITION_NS_AGENT_MAILBOX

  TFM_PARTITION_PROTECTED_STORAGE

  TFM_PARTITION_INTERNAL_TRUSTED_STORAGE

  TFM_PARTITION_CRYPTO

  TFM_PARTITION_INITIAL_ATTESTATION

  TFM_PARTITION_PLATFORM

  TFM_PARTITION_AUDIT_LOG

  TFM_PARTITION_INITIAL_ATTESTATION

  TFM_PARTITION_FIRMWARE_UPDATE

  )



# List of all crypto modules that can be enabled/disabled

# Corresponds to the *_MODULE_DISABLED configs in 'trusted-firmware-m/config/config_default.cmake'

# Corresponds to the *_MODULE_DISABLED configs in 'trusted-firmware-m/secure_fw/partitions/crypto/Kconfig'

set(TFM_CRYPTO_MODULES

  CRYPTO_RNG_MODULE

  CRYPTO_KEY_MODULE
@@ -24,8 +24,8 @@ set(TFM_CRYPTO_MODULES 
  CRYPTO_MAC_MODULE

  CRYPTO_HASH_MODULE

  CRYPTO_CIPHER_MODULE

  CRYPTO_ASYM_ENCRYPT_MODULE

  CRYPTO_ASYM_SIGN_MODULE

  CRYPTO_ASYM_ENCRYPT_MODULE

  CRYPTO_KEY_DERIVATION_MODULE

  )
@@ -47,6 +47,8 @@ if (CONFIG_BUILD_WITH_TFM) 
  endif()

  if (CONFIG_TFM_BL2)

    list(APPEND TFM_CMAKE_ARGS -DBL2=TRUE)

    list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_IMAGE_VERSION_S=${CONFIG_TFM_IMAGE_VERSION_S})

    list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_IMAGE_VERSION_NS=${CONFIG_TFM_IMAGE_VERSION_NS})

  else()

    list(APPEND TFM_CMAKE_ARGS -DBL2=FALSE)

  endif()
@@ -157,7 +159,7 @@ if (CONFIG_BUILD_WITH_TFM) 


  set(VENEERS_FILE ${TFM_BINARY_DIR}/secure_fw/s_veneers.o)

  set(TFM_API_NS_PATH ${TFM_BINARY_DIR}/tf-m-tests/app/libtfm_api_ns.a)

  set(PLATFORM_NS_FILE ${TFM_BINARY_DIR}/platform/libplatform_ns.a)

  set(PLATFORM_NS_FILE ${TFM_BINARY_DIR}/platform/ns/libplatform_ns.a)

  set(TFM_GENERATED_INCLUDES ${TFM_BINARY_DIR}/generated/interface/include)

  set(TFM_INTERFACE_SOURCE_DIR ${TFM_BINARY_DIR}/install/interface/src)
@@ -206,13 +208,11 @@ if (CONFIG_BUILD_WITH_TFM) 
    ${TFM_NS_SIGNED_BIN_FILE}

    ${TFM_S_NS_SIGNED_BIN_FILE}



    ${TFM_INTERFACE_SOURCE_DIR}/tfm_platform_ipc_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_ps_ipc_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_its_ipc_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_crypto_ipc_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_initial_attestation_ipc_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_firmware_update_ipc_api.c



    ${TFM_INTERFACE_SOURCE_DIR}/tfm_attest_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_crypto_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_its_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_platform_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_ps_api.c

    ${TFM_INTERFACE_SOURCE_DIR}/tfm_psa_ns_api.c



    # Specific to nordic_nrf platform
@@ -369,12 +369,12 @@ if (CONFIG_BUILD_WITH_TFM) 
  endif()



  if(NOT CONFIG_TFM_BUILD_NS)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PLATFORM                 ${TFM_INTERFACE_SOURCE_DIR}/tfm_platform_ipc_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PROTECTED_STORAGE        ${TFM_INTERFACE_SOURCE_DIR}/tfm_ps_ipc_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE ${TFM_INTERFACE_SOURCE_DIR}/tfm_its_ipc_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_CRYPTO                   ${TFM_INTERFACE_SOURCE_DIR}/tfm_crypto_ipc_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_INITIAL_ATTESTATION      ${TFM_INTERFACE_SOURCE_DIR}/tfm_initial_attestation_ipc_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_FIRMWARE_UPDATE          ${TFM_INTERFACE_SOURCE_DIR}/tfm_firmware_update_ipc_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PLATFORM                 ${TFM_INTERFACE_SOURCE_DIR}/tfm_platform_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PROTECTED_STORAGE        ${TFM_INTERFACE_SOURCE_DIR}/tfm_ps_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE ${TFM_INTERFACE_SOURCE_DIR}/tfm_its_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_CRYPTO                   ${TFM_INTERFACE_SOURCE_DIR}/tfm_crypto_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_INITIAL_ATTESTATION      ${TFM_INTERFACE_SOURCE_DIR}/tfm_attest_api.c)

    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_FIRMWARE_UPDATE          ${TFM_INTERFACE_SOURCE_DIR}/tfm_fwu_api.c)



    zephyr_library_sources(${TFM_INTERFACE_SOURCE_DIR}/tfm_psa_ns_api.c)
@@ -395,6 +395,7 @@ if (CONFIG_BUILD_WITH_TFM) 


  target_include_directories(tfm_api PRIVATE

    ${TFM_BINARY_DIR}/install/interface/include

    ${TFM_BINARY_DIR}/install/interface/include/crypto_keys

    )



  zephyr_library_link_libraries(
@@ -443,6 +444,7 @@ if (CONFIG_BUILD_WITH_TFM) 
      ${HEX_ADDR_ARGS_${SUFFIX}}

      ${ADD_${SUFFIX}_IMAGE_MIN_VER}

      -s auto

      --measured-boot-record

      -H ${CONFIG_ROM_START_OFFSET}

      ${INPUT_FILE}

      ${OUTPUT_FILE}

west.yml

+4 −4
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ manifest: 
      revision: 8e303c264fc21c2116dc612658003a22e933124d

      path: modules/lib/lz4

    - name: mbedtls

      revision: 7fed49c9b9f983ad6416986661ef637459723bcb

      revision: 6e166050075688fd3cf3d0cb3fc34a1c52df2496

      path: modules/crypto/mbedtls

      groups:

        - crypto
@@ -231,7 +231,7 @@ manifest: 
      groups:

        - debug

    - name: trusted-firmware-m

      revision: 13abde213930ffdf600cf8f01113da8a5fdd9d9c

      revision: 5503c15bd4026e3ea4264a62d70395af34e16742

      path: modules/tee/tf-m/trusted-firmware-m

      groups:

        - tee
@@ -241,12 +241,12 @@ manifest: 
      groups:

        - tee

    - name: tf-m-tests

      revision: bcb53bccccdc05c713aade707e7a8ddad35c210f

      revision: ce57ade67f4e70724975a3bbadeea488f4b9effc

      path: modules/tee/tf-m/tf-m-tests

      groups:

        - tee

    - name: psa-arch-tests

      revision: f4fc2442b8e29e2a03d9899e46e5a3ea3df8c2c9

      revision: 24ed42e34e03ebbc945a7204819c1471cce2bda8

      path: modules/tee/tf-m/psa-arch-tests

      groups:

        - tee

CRA Git | Maintained and supported by SUSTech CRA and CCSE