patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

tf-m: Change NS include path for TF-M 2.0.0

Browse source 
The place where TF-M places its non-secure api header files has changed
Therefore changing it for for all applications that use it.

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
This commit is contained in:
Markus Swarowsky 2023-12-08 14:03:30 +01:00 committed by Carles Cufí
parent 78fd53fae7
commit 11175c3ad3
19 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/bl5340_dvk/CMakeLists.txt
View file

@ -9,7 +9,7 @@ zephyr_library_sources(bl5340_dvk_cpunet_reset.c)
if (CONFIG_BUILD_WITH_TFM)
zephyr_library_include_directories(
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
boards/arm/nrf5340_audio_dk_nrf5340/CMakeLists.txt
View file

@ -8,7 +8,7 @@ if ((CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_AUDIO_
if (CONFIG_BUILD_WITH_TFM)
zephyr_library_include_directories(
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
boards/arm/nrf5340dk_nrf5340/CMakeLists.txt
View file

@ -8,7 +8,7 @@ zephyr_library_sources(nrf5340_cpunet_reset.c)
if (CONFIG_BUILD_WITH_TFM)
zephyr_library_include_directories(
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
drivers/entropy/CMakeLists.txt
View file

@ -28,6 +28,6 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_PSA_CRYPTO_RNG entropy_psa_crypt
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(${ZEPHYR_CURRENT_LIBRARY} PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
modules/uoscore-uedhoc/CMakeLists.txt
View file

@ -29,7 +29,7 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)
if (CONFIG_BUILD_WITH_TFM)
zephyr_library_include_directories(
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
samples/bluetooth/mesh/CMakeLists.txt
View file

@ -16,6 +16,6 @@ endif()
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
samples/bluetooth/mesh_demo/CMakeLists.txt
View file

@ -15,6 +15,6 @@ endif()
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
samples/bluetooth/mesh_provisioner/CMakeLists.txt
View file

@ -10,6 +10,6 @@ target_sources(app PRIVATE src/main.c)
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
samples/drivers/counter/alarm/CMakeLists.txt
View file

@ -9,6 +9,6 @@ target_sources(app PRIVATE ${app_sources})
if(CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
samples/subsys/usb/mass/CMakeLists.txt
View file

@ -16,6 +16,6 @@ target_sources(app PRIVATE ${app_sources})
if(CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
samples/tfm_integration/psa_crypto/CMakeLists.txt
View file

@ -16,7 +16,7 @@ target_sources(app PRIVATE src/util_app_log.c)
target_sources(app PRIVATE src/util_sformat.c)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
# In TF-M, default value of CRYPTO_ENGINE_BUF_SIZE is 0x2080. It causes

2
samples/tfm_integration/psa_protected_storage/CMakeLists.txt
View file

@ -13,5 +13,5 @@ project(protected_storage)
target_sources(app PRIVATE src/main.c)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)

2
samples/tfm_integration/tfm_ipc/CMakeLists.txt
View file

@ -9,5 +9,5 @@ project(tfm_ipc)
target_sources(app PRIVATE src/main.c)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)

2
samples/tfm_integration/tfm_psa_test/CMakeLists.txt
View file

@ -13,5 +13,5 @@ project(tfm_psa_storage_test)
target_sources(app PRIVATE src/main.c)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)

2
samples/tfm_integration/tfm_secure_partition/CMakeLists.txt
View file

@ -28,7 +28,7 @@ target_sources(app PRIVATE
)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
target_compile_definitions(app

2
soc/arm/nordic_nrf/common/CMakeLists.txt
View file

@ -8,6 +8,6 @@ zephyr_include_directories(.)
if (CONFIG_TFM_PARTITION_PLATFORM)
zephyr_sources(soc_secure.c)
zephyr_library_include_directories(
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
subsys/bluetooth/mesh/CMakeLists.txt
View file

@ -134,6 +134,6 @@ zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(${ZEPHYR_CURRENT_LIBRARY} PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
subsys/net/lib/tls_credentials/CMakeLists.txt
View file

@ -18,6 +18,6 @@ zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
if (CONFIG_TLS_CREDENTIALS_BACKEND_PROTECTED_STORAGE AND CONFIG_BUILD_WITH_TFM)
target_include_directories(${ZEPHYR_CURRENT_LIBRARY} PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()

2
tests/arch/arm/arm_thread_swap_tz/CMakeLists.txt
View file

@ -14,6 +14,6 @@ target_sources(app PRIVATE ${app_sources})
if (CONFIG_BUILD_WITH_TFM)
target_include_directories(app PRIVATE
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
)
endif()