aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorHåkon Øye Amundsen <haakon.amundsen@nordicsemi.no>2021-04-15 08:20:22 +0200
committerDavid Hu <david.hu@arm.com>2021-04-19 16:01:32 +0200
commit4aa5a400f7f642766398c4c700aca6fde7bc9e15 (patch)
tree48110a90411c4fd9f11059ef9484272eea1cae01 /platform
parente8d380874e87714acca9afef3e6d31ab724c9c0c (diff)
downloadtrusted-firmware-m-4aa5a400f7f642766398c4c700aca6fde7bc9e15.tar.gz
nordic_nrf: move tfm_platform_system.c to board instead of SoC
Different boards might require different platform service definitions. Also, this way out-of-tree platforms can provide their own variant of the platform services. Change-ID: Ib64b9e5eb61137e21461c0e37f55af5ab5c8fed2 Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
Diffstat (limited to 'platform')
-rw-r--r--platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt1
-rw-r--r--platform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt1
-rw-r--r--platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/CMakeLists.txt5
-rw-r--r--platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/services/src/tfm_platform_system.c (renamed from platform/ext/target/nordic_nrf/common/nrf5340/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/CMakeLists.txt5
-rw-r--r--platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/services/src/tfm_platform_system.c (renamed from platform/ext/target/nordic_nrf/common/nrf9160/services/src/tfm_platform_system.c)0
6 files changed, 10 insertions, 2 deletions
diff --git a/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt
index e3888296a..50bb1ee2d 100644
--- a/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt
+++ b/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt
@@ -44,7 +44,6 @@ target_sources(platform_s
PRIVATE
target_cfg.c
../core/nrfx/mdk/system_nrf5340_application.c
- $<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
)
target_compile_definitions(platform_s
diff --git a/platform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt
index 63ee34b30..29f875945 100644
--- a/platform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt
+++ b/platform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt
@@ -44,7 +44,6 @@ target_sources(platform_s
PRIVATE
target_cfg.c
../core/nrfx/mdk/system_nrf9160.c
- $<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
)
target_compile_definitions(platform_s
diff --git a/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/CMakeLists.txt b/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/CMakeLists.txt
index ee8932da7..81b8e6254 100644
--- a/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/CMakeLists.txt
+++ b/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/CMakeLists.txt
@@ -16,6 +16,11 @@ target_include_directories(platform_region_defs
../common/nrf5340/partition
)
+target_sources(platform_s
+ PRIVATE
+ $<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
+)
+
target_include_directories(platform_s
PUBLIC
.
diff --git a/platform/ext/target/nordic_nrf/common/nrf5340/services/src/tfm_platform_system.c b/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/services/src/tfm_platform_system.c
index 1b115fc46..1b115fc46 100644
--- a/platform/ext/target/nordic_nrf/common/nrf5340/services/src/tfm_platform_system.c
+++ b/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/CMakeLists.txt b/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/CMakeLists.txt
index 04deafd67..61b16d5df 100644
--- a/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/CMakeLists.txt
+++ b/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/CMakeLists.txt
@@ -16,6 +16,11 @@ target_include_directories(platform_region_defs
../common/nrf9160/partition
)
+target_sources(platform_s
+ PRIVATE
+ $<$<BOOL:${TFM_PARTITION_PLATFORM}>:${CMAKE_CURRENT_SOURCE_DIR}/services/src/tfm_platform_system.c>
+)
+
target_include_directories(platform_s
PUBLIC
.
diff --git a/platform/ext/target/nordic_nrf/common/nrf9160/services/src/tfm_platform_system.c b/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/services/src/tfm_platform_system.c
index 1b115fc46..1b115fc46 100644
--- a/platform/ext/target/nordic_nrf/common/nrf9160/services/src/tfm_platform_system.c
+++ b/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/services/src/tfm_platform_system.c