aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMate Toth-Pal <mate.toth-pal@arm.com>2019-07-10 15:35:28 +0200
committerKen Liu <ken.liu@arm.com>2019-07-22 06:32:35 +0000
commitbf24f40c3548c938021d63d185af3d64415a44e5 (patch)
tree7a435fb798c14ca4dae46d20649b59dc08546001
parentbe4b587a9e480944b954c835e2ac2544ca7d195f (diff)
downloadtrusted-firmware-m-bf24f40c3548c938021d63d185af3d64415a44e5.tar.gz
Core: Move tfm_utils from ipc to core
Move tfm_utils source and header to the core folder, so that the utilities can be used from library model as well. Change-Id: I17f70e4e7f377c76c583571fac6aa12c9bb4afd0 Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
-rw-r--r--secure_fw/core/CMakeLists.inc1
-rw-r--r--secure_fw/core/ipc/CMakeLists.inc2
-rw-r--r--secure_fw/core/tfm_utils.c (renamed from secure_fw/core/ipc/tfm_utils.c)0
-rw-r--r--secure_fw/core/tfm_utils.h (renamed from secure_fw/core/ipc/include/tfm_utils.h)0
4 files changed, 2 insertions, 1 deletions
diff --git a/secure_fw/core/CMakeLists.inc b/secure_fw/core/CMakeLists.inc
index 250486f9..22a742a6 100644
--- a/secure_fw/core/CMakeLists.inc
+++ b/secure_fw/core/CMakeLists.inc
@@ -38,6 +38,7 @@ set (SS_CORE_C_SRC
"${SS_CORE_DIR}/tfm_spm_services.c"
"${SS_CORE_DIR}/tfm_nspm.c"
"${SS_CORE_DIR}/tfm_boot_data.c"
+ "${SS_CORE_DIR}/tfm_utils.c"
)
#Append all our source files to global lists.
diff --git a/secure_fw/core/ipc/CMakeLists.inc b/secure_fw/core/ipc/CMakeLists.inc
index b7cb51db..e369a424 100644
--- a/secure_fw/core/ipc/CMakeLists.inc
+++ b/secure_fw/core/ipc/CMakeLists.inc
@@ -38,13 +38,13 @@ elseif (TFM_PSA_API)
"${SS_IPC_DIR}/psa_client.c"
"${SS_IPC_DIR}/tfm_thread.c"
"${SS_IPC_DIR}/tfm_wait.c"
- "${SS_IPC_DIR}/tfm_utils.c"
"${SS_IPC_DIR}/tfm_message_queue.c"
"${SS_IPC_DIR}/tfm_pools.c"
"${SS_IPC_DIR}/tfm_spm.c"
"${SS_IPC_DIR}/../tfm_core.c"
"${SS_IPC_DIR}/../tfm_secure_api.c"
"${SS_IPC_DIR}/../tfm_spm_services.c"
+ "${SS_IPC_DIR}/../tfm_utils.c"
"${SS_IPC_DIR}/../tfm_handler.c"
"${SS_IPC_DIR}/../tfm_nspm.c"
"${SS_IPC_DIR}/../tfm_boot_data.c"
diff --git a/secure_fw/core/ipc/tfm_utils.c b/secure_fw/core/tfm_utils.c
index dd15494e..dd15494e 100644
--- a/secure_fw/core/ipc/tfm_utils.c
+++ b/secure_fw/core/tfm_utils.c
diff --git a/secure_fw/core/ipc/include/tfm_utils.h b/secure_fw/core/tfm_utils.h
index 01462bcc..01462bcc 100644
--- a/secure_fw/core/ipc/include/tfm_utils.h
+++ b/secure_fw/core/tfm_utils.h