[nrf fromtree] tfm: Remove TFM_BUILD_NS and update TFM_USE_NS_APP for NS build folder

TF-M no longer builds the NS app, but exports build files to api_ns
folder and expects the user to build the rest themselves.
Remove the option to build the NS app, and update the TFM_USE_NS_APP
to look for an output hex file in the tfm_ns folder.

Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Markus Swarowsky <[email protected]>
(cherry picked from commit f49cbf1)
Signed-off-by: Markus Swarowsky <[email protected]>

Author: joerchan

modules/trusted-firmware-m/CMakeLists.txt

@@ -51,11 +51,6 @@ if (CONFIG_BUILD_WITH_TFM)
   else()
     list(APPEND TFM_CMAKE_ARGS -DBL2=FALSE)
   endif()
-  if (CONFIG_TFM_BUILD_NS)
-    list(APPEND TFM_CMAKE_ARGS -DNS=TRUE)
-  else()
-    list(APPEND TFM_CMAKE_ARGS -DNS=FALSE)
-  endif()
   if (CONFIG_TFM_ISOLATION_LEVEL)
     list(APPEND TFM_CMAKE_ARGS -DTFM_ISOLATION_LEVEL=${CONFIG_TFM_ISOLATION_LEVEL})
   endif()
@@ -185,9 +180,6 @@ if (CONFIG_BUILD_WITH_TFM)
   set(TFM_INTERFACE_INCLUDE_DIR  ${TFM_BINARY_DIR}/api_ns/interface/include)
   set(TFM_INTERFACE_LIB_DIR      ${TFM_BINARY_DIR}/api_ns/interface/lib)
 
-  set(TFM_API_NS_PATH ${TFM_BINARY_DIR}/tf-m-tests/app/libtfm_api_ns.a)
-  set(PLATFORM_NS_FILE ${TFM_BINARY_DIR}/platform/ns/libplatform_ns.a)
-
   if (TFM_PSA_TEST_SUITE)
     set(PSA_TEST_VAL_FILE ${TFM_BINARY_DIR}/tf-m-tests/app/psa_api_tests/val/val_nspe.a)
     set(PSA_TEST_PAL_FILE ${TFM_BINARY_DIR}/tf-m-tests/app/psa_api_tests/platform/pal_nspe.a)
@@ -208,27 +200,22 @@ if (CONFIG_BUILD_WITH_TFM)
   set(TFM_S_BIN_FILE ${TFM_BINARY_DIR}/bin/tfm_s.bin)
   set(TFM_S_HEX_FILE ${TFM_BINARY_DIR}/bin/tfm_s.hex)
   set(TFM_NS_BIN_FILE ${TFM_BINARY_DIR}/bin/tfm_ns.bin)
-  set(TFM_NS_HEX_FILE ${TFM_BINARY_DIR}/bin/tfm_ns.hex)
+  set(TFM_NS_HEX_FILE ${CMAKE_BINARY_DIR}/tfm_ns/bin/tfm_ns.hex)
   set(TFM_S_SIGNED_BIN_FILE ${TFM_BINARY_DIR}/bin/tfm_s_signed.bin)
   set(TFM_NS_SIGNED_BIN_FILE ${TFM_BINARY_DIR}/bin/tfm_ns_signed.bin)
   set(TFM_S_NS_SIGNED_BIN_FILE ${TFM_BINARY_DIR}/bin/tfm_s_ns_signed.bin)
 
   set(BUILD_BYPRODUCTS
-    ${TFM_API_NS_PATH}
     ${PSA_TEST_VAL_FILE}
     ${PSA_TEST_PAL_FILE}
     ${PSA_TEST_COMBINE_FILE}
-    ${PLATFORM_NS_FILE}
     ${BL2_ELF_FILE}
     ${BL2_BIN_FILE}
     ${BL2_HEX_FILE}
     ${TFM_S_ELF_FILE}
     ${TFM_S_BIN_FILE}
     ${TFM_S_HEX_FILE}
-    ${TFM_NS_BIN_FILE}
-    ${TFM_NS_HEX_FILE}
     ${TFM_S_SIGNED_BIN_FILE}
-    ${TFM_NS_SIGNED_BIN_FILE}
     ${TFM_S_NS_SIGNED_BIN_FILE}
 
     ${TFM_INTERFACE_LIB_DIR}/s_veneers.o
@@ -426,25 +413,17 @@ 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_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_tz_psa_ns_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)
 
-    if(CONFIG_SOC_FAMILY_NRF)
-      zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PLATFORM               ${TFM_INTERFACE_SOURCE_DIR}/tfm_ioctl_core_ns_api.c)
-    endif()
+  zephyr_library_sources(${TFM_INTERFACE_SOURCE_DIR}/tfm_tz_psa_ns_api.c)
 
-  else()
-    zephyr_library_link_libraries(
-      ${PLATFORM_NS_FILE}
-      ${TFM_API_NS_PATH}
-      )
+  if(CONFIG_SOC_FAMILY_NRF)
+    zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PLATFORM               ${TFM_INTERFACE_SOURCE_DIR}/tfm_ioctl_core_ns_api.c)
   endif()
 
   target_include_directories(tfm_api PRIVATE

modules/trusted-firmware-m/Kconfig.tfm

@@ -226,19 +226,8 @@ config TFM_BL2
 	  TFM is designed to run with MCUboot in a certain configuration.
 	  This config adds MCUboot to the build - built via TFM's build system.
 
-config TFM_BUILD_NS
-	bool "Build the TF-M Non-Secure application and libraries"
-	help
-	  Instruct the TF-M build system to build the TF-M Non-Secure
-	  application and libraries.
-
-	  This option is intended for testing purposes only, since this is the
-	  easiest way to build the TF-M regression tests application and test
-	  support libraries in the zephyr build system.
-
 config TFM_USE_NS_APP
 	bool "Use the TF-M Non-Secure application"
-	depends on TFM_BUILD_NS
 	help
 	  The TF-M build system can produce multiple executable files.
 	  The main one is the TF-M secure firmware. Optionally the TF-M

samples/tfm_integration/tfm_psa_test/prj.conf

@@ -5,7 +5,6 @@
 #
 
 CONFIG_BUILD_WITH_TFM=y
-CONFIG_TFM_BUILD_NS=y
 CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
 CONFIG_QEMU_ICOUNT_SHIFT=1
 

samples/tfm_integration/tfm_regression_test/prj.conf

@@ -6,7 +6,6 @@
 
 CONFIG_BUILD_WITH_TFM=y
 CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
-CONFIG_TFM_BUILD_NS=y
 CONFIG_TFM_USE_NS_APP=y
 CONFIG_TFM_REGRESSION_S=y
 CONFIG_TFM_REGRESSION_NS=y