[nrf noup] Revert "build: Remove forced NS init and startup files"

This reverts commit 5206a41.

This change does not work with NRF devices. The issue is that
this changes the target which contains the startup files.
Before it was the tfm_ns and this made it to platform_ns.
This does't work with NRF devices, after this change
the startup files are compiled multiple times and for
some unknown reason one of the compilication doesn't work
and produces an .o file which is not an object file.

This needs further investigation, so I opened a task
to investigate further: NCSDK-35302

I reverted the commit to unblock the current upmerge
process.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>

Author: Vge0rge

cmake/spe-CMakeLists.cmake

@@ -116,11 +116,8 @@ target_sources(platform_ns
         $<$<BOOL:${PLATFORM_DEFAULT_UART_STDOUT}>:${CMAKE_CURRENT_SOURCE_DIR}/platform/ext/common/uart_stdout.c>
 )
 
-add_library(platform_ns_definitions INTERFACE)
-
-# these compile definitions must match on the secure and nonsecure side for security
-target_compile_definitions(platform_ns_definitions
-    INTERFACE
+target_compile_definitions(platform_ns
+    PUBLIC
         DOMAIN_NS=1
         $<$<BOOL:${PLATFORM_DEFAULT_CRYPTO_KEYS}>:PLATFORM_DEFAULT_CRYPTO_KEYS>
         $<$<STREQUAL:${CONFIG_TFM_FLOAT_ABI},hard>:CONFIG_TFM_FLOAT_ABI=2>
@@ -129,22 +126,10 @@ target_compile_definitions(platform_ns_definitions
         $<$<BOOL:${CONFIG_TFM_ENABLE_CP10CP11}>:CONFIG_TFM_ENABLE_CP10CP11>
 )
 
-target_link_libraries(platform_ns
-    PUBLIC
-        platform_ns_definitions
-)
-
-if (DEFINED PLATFORM_CUSTOM_NS_FILES)
-    message(STATUS "Using PLATFORM_CUSTOM_NS_FILES: ${PLATFORM_CUSTOM_NS_FILES}")
-else()
-    set(PLATFORM_CUSTOM_NS_FILES FALSE)
-endif()
-
 target_link_libraries(tfm_api_ns
     PUBLIC
         platform_region_defs
-        platform_ns_definitions
-        $<$<NOT:$<BOOL:${PLATFORM_CUSTOM_NS_FILES}>>:platform_ns>
+        platform_ns
 )
 
 if(BL2 AND PLATFORM_DEFAULT_IMAGE_SIGNING)

platform/ext/target/arm/mps3/corstone300/common/ns/common.cmake

@@ -19,7 +19,7 @@ target_include_directories(platform_region_defs
         ${PLATFORM_DIR}
 )
 
-target_sources(platform_ns
+target_sources(${NS_TARGET_NAME}
     PRIVATE
         ${CORSTONE300_COMMON_DIR}/device/source/startup_corstone300.c
         ${CORSTONE300_COMMON_DIR}/device/source/system_core_init.c

platform/ext/target/arm/mps3/corstone310/common/ns/common.cmake

@@ -20,7 +20,7 @@ target_include_directories(platform_region_defs
 
 #========================= Platform common defs ===============================#
 
-target_sources(platform_ns
+target_sources(${NS_TARGET_NAME}
     PRIVATE
         ${CORSTONE310_COMMON_DIR}/device/source/startup_corstone310.c
         ${CORSTONE310_COMMON_DIR}/device/source/system_core_init.c

platform/ext/target/arm/mps4/common/ns/CMakeLists.txt

@@ -25,7 +25,7 @@ target_include_directories(platform_region_defs
 
 #========================= Platform common defs ===============================#
 
-target_sources(platform_ns
+target_sources(${NS_TARGET_NAME}
     PRIVATE
         device/source/startup_mps4_corstone3xx.c
         device/source/system_core_init.c

platform/ext/target/armchina/mps3/alcor/common/ns/common.cmake

@@ -20,7 +20,7 @@ target_include_directories(platform_region_defs
         ${PLATFORM_DIR}
 )
 
-target_sources(platform_ns
+target_sources(${NS_TARGET_NAME}
     PRIVATE
         ${ALCOR_COMMON_DIR}/device/source/startup_alcor_mps3.c
         ${ALCOR_COMMON_DIR}/device/source/system_core_init.c

platform/ext/target/nordic_nrf/common/core/ns/CMakeLists.txt

@@ -17,8 +17,8 @@ target_compile_definitions(platform_region_defs
 )
 
 # Startup sources should be put in the executable
-target_sources(platform_ns
-    PUBLIC
+target_sources(${NS_TARGET_NAME}
+    PRIVATE
         startup.c
         $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/startup_${target}.c>
 )

platform/ext/target/nuvoton/m2351/CMakeLists.txt

@@ -133,11 +133,11 @@ target_sources(tfm_spm
 
 
 if(NS)
-    target_sources(platform_ns
+    target_sources(${NS_TARGET_NAME}
         PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_m2351.c
     )
-    target_add_scatter_file(platform_ns
+    target_add_scatter_file(${NS_TARGET_NAME}
         $<$<C_COMPILER_ID:ARMClang>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/armclang/m2351_ns.sct>
         $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/gcc/m2351_ns.ld>
         $<$<C_COMPILER_ID:IAR>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/iar/m2351_ns.icf>

platform/ext/target/nuvoton/m2354/CMakeLists.txt

@@ -135,11 +135,11 @@ target_sources(tfm_spm
 
 
 if(NS)
-    target_sources(platform_ns
+    target_sources(${NS_TARGET_NAME}
         PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_m2354.c
     )
-    target_add_scatter_file(platform_ns
+    target_add_scatter_file(${NS_TARGET_NAME}
         $<$<C_COMPILER_ID:ARMClang>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/armclang/m2354_ns.sct>
         $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/gcc/m2354_ns.ld>
         $<$<C_COMPILER_ID:IAR>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/iar/m2354_ns.icf>

platform/ext/target/stm/stm32h573i_dk/CMakeLists.txt

@@ -21,7 +21,7 @@ target_sources(tfm_s
 )
 
 if(NS)
-    target_sources(platform_ns
+    target_sources(${NS_TARGET_NAME}
         PRIVATE
             ${STM_COMMON_DIR}/stm32h5xx/Device/Source/startup_stm32h5xx_ns.c
     )