[nrf fromtree] tfm: Add NS build support for zephyr out-of-tree nordic_nrf platform.

joerchan · Vge0rge · commit 339058de0040 · 2024-02-12T22:08:59.000+01:00
Add build of the NS application in the zephyr defined out-of-tree board support for the nordic_nrf platform. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no> (cherry picked from commit 6c92749) Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
diff --git a/modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt b/modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt
@@ -46,14 +46,18 @@ if(BL2)
     )
 endif()
 
+target_sources(tfm_spm
+    PRIVATE
+        src/tfm_hal_platform.c
+)
+
 if (TFM_PARTITION_PLATFORM)
 install(FILES       include/tfm_ioctl_api.h
+                    include/device_cfg.h
+                    include/RTE_Device.h
+                    include/tfm_ioctl_api.h
         DESTINATION ${INSTALL_INTERFACE_INC_DIR})
 endif()
 
-#========================= tfm_spm ============================================#
-
-target_sources(tfm_spm
-    PRIVATE
-        src/tfm_hal_platform.c
-)
+install(FILES       ns/CMakeLists.txt
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR})
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/CMakeLists.txt
@@ -5,8 +5,14 @@
 #
 
 set(NRF_BOARD_SELECTED True)
-set(NRF_SOC_VARIANT nrf5340)
 
 add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf5340 nrf5340)
 
 add_subdirectory(.. common)
+
+install(FILES       ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+        RENAME      cpuarch.cmake)
+
+install(FILES       config.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR})
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/config.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/config.cmake
@@ -4,5 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(PLATFORM_PATH platform/ext/target/nordic_nrf/)
+set(NRF_SOC_VARIANT nrf5340 CACHE STRING "nRF SoC Variant")
+
 include(${PLATFORM_PATH}/common/nrf5340/config.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/cpuarch.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/cpuarch.cmake
@@ -4,4 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include(platform/ext/target/nordic_nrf/common/nrf5340/cpuarch.cmake)
+set(PLATFORM_PATH platform/ext/target/nordic_nrf)
+
+include(${PLATFORM_PATH}/common/nrf5340/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/ns/cpuarch_ns.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_DIR  ${CMAKE_CURRENT_LIST_DIR})
+set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+include(${CMAKE_CURRENT_LIST_DIR}/common/nrf5340/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/CMakeLists.txt b/modules/trusted-firmware-m/nordic_nrf/nrf9120/CMakeLists.txt
@@ -5,8 +5,17 @@
 #
 
 set(NRF_BOARD_SELECTED True)
-set(NRF_SOC_VARIANT nrf91)
 
 add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf91 nrf91)
 
 add_subdirectory(.. common)
+
+install(FILES       ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+        RENAME      cpuarch.cmake)
+
+install(FILES       ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf9120/cpuarch.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}/common/nrf9120)
+
+install(FILES       config.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR})
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/config.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf9120/config.cmake
@@ -4,5 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(PLATFORM_PATH platform/ext/target/nordic_nrf/)
+set(NRF_SOC_VARIANT nrf91 CACHE STRING "nRF SoC Variant")
+
 include(${PLATFORM_PATH}/common/nrf91/config.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/cpuarch.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf9120/cpuarch.cmake
@@ -3,5 +3,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+set(PLATFORM_PATH platform/ext/target/nordic_nrf)
 
-include(platform/ext/target/nordic_nrf/common/nrf9120/cpuarch.cmake)
+include(${PLATFORM_PATH}/common/nrf9120/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf9120/ns/cpuarch_ns.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_DIR  ${CMAKE_CURRENT_LIST_DIR})
+set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+include(${CMAKE_CURRENT_LIST_DIR}/common/nrf9120/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/CMakeLists.txt b/modules/trusted-firmware-m/nordic_nrf/nrf9160/CMakeLists.txt
@@ -5,8 +5,17 @@
 #
 
 set(NRF_BOARD_SELECTED True)
-set(NRF_SOC_VARIANT nrf91)
 
 add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf91 nrf91)
 
 add_subdirectory(.. common)
+
+install(FILES       ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}
+        RENAME      cpuarch.cmake)
+
+install(FILES       ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf9160/cpuarch.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR}/common/nrf9160)
+
+install(FILES       config.cmake
+        DESTINATION ${INSTALL_PLATFORM_NS_DIR})
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/config.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf9160/config.cmake
@@ -4,5 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(PLATFORM_PATH platform/ext/target/nordic_nrf/)
+set(NRF_SOC_VARIANT nrf91 CACHE STRING "nRF SoC Variant")
+
 include(${PLATFORM_PATH}/common/nrf91/config.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/cpuarch.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf9160/cpuarch.cmake
@@ -4,4 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include(platform/ext/target/nordic_nrf/common/nrf9160/cpuarch.cmake)
+set(PLATFORM_PATH platform/ext/target/nordic_nrf)
+
+include(${PLATFORM_PATH}/common/nrf9160/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic_nrf/nrf9160/ns/cpuarch_ns.cmake
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(PLATFORM_DIR  ${CMAKE_CURRENT_LIST_DIR})
+set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+include(${CMAKE_CURRENT_LIST_DIR}/common/nrf9160/cpuarch.cmake)
diff --git a/modules/trusted-firmware-m/nordic_nrf/ns/CMakeLists.txt b/modules/trusted-firmware-m/nordic_nrf/ns/CMakeLists.txt
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2023, Nordic Semiconductor ASA.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cmake_policy(SET CMP0076 NEW)
+set(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
+set(NRF_BOARD_SELECTED True)
+
+add_library(platform_ns STATIC)
+
+set(partition_includes
+    ${CMAKE_CURRENT_LIST_DIR}/common/${NRF_SOC_VARIANT}/partition
+    ${CMAKE_BINARY_DIR}/../zephyr/include/generated
+)
+
+set(board_includes
+    ${CMAKE_BINARY_DIR}/../zephyr/misc/generated/syscalls_links/include
+    ${ZEPHYR_BASE}/include
+)
+
+target_include_directories(platform_region_defs
+    INTERFACE
+        ${partition_includes}
+)
+
+target_include_directories(platform_ns
+    PUBLIC
+        ${partition_includes}
+        ${board_includes}
+)
+
+# Get the value of HAL_NORDIC_PATH
+include(${CMAKE_CURRENT_LIST_DIR}/common/core/config_nordic_nrf_spe.cmake)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common/${NRF_SOC_VARIANT} ${NRF_SOC_VARIANT})
+
+target_include_directories(platform_ns
+    PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}
+)
+
+target_link_libraries(platform_ns
+    PUBLIC
+        platform_region_defs
+)

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
`6`	`6`
`7`		`-set(PLATFORM_PATH platform/ext/target/nordic_nrf/)`
	`7`	`+set(NRF_SOC_VARIANT nrf5340 CACHE STRING "nRF SoC Variant")`
	`8`	`+`
`8`	`9`	`include(${PLATFORM_PATH}/common/nrf5340/config.cmake)`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,6 @@`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
`6`	`6`
`7`		`-include(platform/ext/target/nordic_nrf/common/nrf5340/cpuarch.cmake)`
	`7`	`+set(PLATFORM_PATH platform/ext/target/nordic_nrf)`
	`8`	`+`
	`9`	`+include(${PLATFORM_PATH}/common/nrf5340/cpuarch.cmake)`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
	`6`	`+set(PLATFORM_PATH platform/ext/target/nordic_nrf)`
`6`	`7`
`7`		`-include(platform/ext/target/nordic_nrf/common/nrf9120/cpuarch.cmake)`
	`8`	`+include(${PLATFORM_PATH}/common/nrf9120/cpuarch.cmake)`