[nrf fromtree] tf-m: Change NS include path for TF-M 2.0.0

mswarowsky · Vge0rge · commit d87a21390d70 · 2024-02-12T22:08:58.000+01:00
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> (cherry picked from commit 11175c3) Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
diff --git a/boards/arm/bl5340_dvk/CMakeLists.txt b/boards/arm/bl5340_dvk/CMakeLists.txt
@@ -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()
 
diff --git a/boards/arm/nrf5340_audio_dk_nrf5340/CMakeLists.txt b/boards/arm/nrf5340_audio_dk_nrf5340/CMakeLists.txt
@@ -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()
 
diff --git a/boards/arm/nrf5340dk_nrf5340/CMakeLists.txt b/boards/arm/nrf5340dk_nrf5340/CMakeLists.txt
@@ -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()
 
diff --git a/drivers/entropy/CMakeLists.txt b/drivers/entropy/CMakeLists.txt
@@ -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()
diff --git a/modules/uoscore-uedhoc/CMakeLists.txt b/modules/uoscore-uedhoc/CMakeLists.txt
@@ -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()
 
diff --git a/samples/bluetooth/mesh/CMakeLists.txt b/samples/bluetooth/mesh/CMakeLists.txt
@@ -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()
diff --git a/samples/bluetooth/mesh_demo/CMakeLists.txt b/samples/bluetooth/mesh_demo/CMakeLists.txt
@@ -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()
diff --git a/samples/bluetooth/mesh_provisioner/CMakeLists.txt b/samples/bluetooth/mesh_provisioner/CMakeLists.txt
@@ -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()
diff --git a/samples/drivers/counter/alarm/CMakeLists.txt b/samples/drivers/counter/alarm/CMakeLists.txt
@@ -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()
diff --git a/samples/subsys/usb/mass/CMakeLists.txt b/samples/subsys/usb/mass/CMakeLists.txt
@@ -15,6 +15,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()
diff --git a/samples/tfm_integration/psa_crypto/CMakeLists.txt b/samples/tfm_integration/psa_crypto/CMakeLists.txt
@@ -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
diff --git a/samples/tfm_integration/psa_protected_storage/CMakeLists.txt b/samples/tfm_integration/psa_protected_storage/CMakeLists.txt
@@ -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
 )
diff --git a/samples/tfm_integration/tfm_ipc/CMakeLists.txt b/samples/tfm_integration/tfm_ipc/CMakeLists.txt
@@ -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
 )
diff --git a/samples/tfm_integration/tfm_psa_test/CMakeLists.txt b/samples/tfm_integration/tfm_psa_test/CMakeLists.txt
@@ -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
 )
diff --git a/samples/tfm_integration/tfm_secure_partition/CMakeLists.txt b/samples/tfm_integration/tfm_secure_partition/CMakeLists.txt
@@ -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
diff --git a/soc/arm/nordic_nrf/common/CMakeLists.txt b/soc/arm/nordic_nrf/common/CMakeLists.txt
@@ -11,6 +11,6 @@ set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/li
 if (CONFIG_TFM_PARTITION_PLATFORM)
   zephyr_library_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()
diff --git a/subsys/bluetooth/mesh/CMakeLists.txt b/subsys/bluetooth/mesh/CMakeLists.txt
@@ -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()
diff --git a/subsys/net/lib/tls_credentials/CMakeLists.txt b/subsys/net/lib/tls_credentials/CMakeLists.txt
@@ -15,3 +15,9 @@ zephyr_library_sources_ifdef(CONFIG_TLS_CREDENTIALS_SHELL
 )
 
 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>/api_ns/interface/include
+  )
+endif()
diff --git a/tests/arch/arm/arm_thread_swap_tz/CMakeLists.txt b/tests/arch/arm/arm_thread_swap_tz/CMakeLists.txt
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ zephyr_library_sources(bl5340_dvk_cpunet_reset.c)`
`9`	`9`
`10`	`10`	`if (CONFIG_BUILD_WITH_TFM)`
`11`	`11`	`zephyr_library_include_directories(`
`12`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`12`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`13`	`13`	`)`
`14`	`14`	`endif()`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ if ((CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP OR CONFIG_BOARD_NRF5340_AUDIO_`
`8`	`8`
`9`	`9`	`if (CONFIG_BUILD_WITH_TFM)`
`10`	`10`	`zephyr_library_include_directories(`
`11`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`11`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`12`	`12`	`)`
`13`	`13`	`endif()`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ zephyr_library_sources(nrf5340_cpunet_reset.c)`
`8`	`8`
`9`	`9`	`if (CONFIG_BUILD_WITH_TFM)`
`10`	`10`	`zephyr_library_include_directories(`
`11`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`11`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`12`	`12`	`)`
`13`	`13`	`endif()`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_PSA_CRYPTO_RNG entropy_psa_crypt`
`28`	`28`
`29`	`29`	`if (CONFIG_BUILD_WITH_TFM)`
`30`	`30`	`target_include_directories(${ZEPHYR_CURRENT_LIBRARY} PRIVATE`
`31`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`31`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`32`	`32`	`)`
`33`	`33`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)`
`29`	`29`
`30`	`30`	`if (CONFIG_BUILD_WITH_TFM)`
`31`	`31`	`zephyr_library_include_directories(`
`32`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`32`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`33`	`33`	`)`
`34`	`34`	`endif()`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ endif()`
`16`	`16`
`17`	`17`	`if (CONFIG_BUILD_WITH_TFM)`
`18`	`18`	`target_include_directories(app PRIVATE`
`19`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`19`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`20`	`20`	`)`
`21`	`21`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ endif()`
`15`	`15`
`16`	`16`	`if (CONFIG_BUILD_WITH_TFM)`
`17`	`17`	`target_include_directories(app PRIVATE`
`18`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`18`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`19`	`19`	`)`
`20`	`20`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ target_sources(app PRIVATE src/main.c)`
`10`	`10`
`11`	`11`	`if (CONFIG_BUILD_WITH_TFM)`
`12`	`12`	`target_include_directories(app PRIVATE`
`13`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`13`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`14`	`14`	`)`
`15`	`15`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ target_sources(app PRIVATE ${app_sources})`
`9`	`9`
`10`	`10`	`if(CONFIG_BUILD_WITH_TFM)`
`11`	`11`	`target_include_directories(app PRIVATE`
`12`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`12`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`13`	`13`	`)`
`14`	`14`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ target_sources(app PRIVATE ${app_sources})`
`15`	`15`
`16`	`16`	`if(CONFIG_BUILD_WITH_TFM)`
`17`	`17`	`target_include_directories(app PRIVATE`
`18`		`- $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include`
	`18`	`+ $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include`
`19`	`19`	`)`
`20`	`20`	`endif()`