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>
diff --git a/secure_fw/core/CMakeLists.inc b/secure_fw/core/CMakeLists.inc
index 250486f..22a742a 100644
--- a/secure_fw/core/CMakeLists.inc
+++ b/secure_fw/core/CMakeLists.inc
@@ -38,6 +38,7 @@
"${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 b7cb51d..e369a42 100644
--- a/secure_fw/core/ipc/CMakeLists.inc
+++ b/secure_fw/core/ipc/CMakeLists.inc
@@ -38,13 +38,13 @@
"${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
similarity index 100%
rename from secure_fw/core/ipc/tfm_utils.c
rename to secure_fw/core/tfm_utils.c
diff --git a/secure_fw/core/ipc/include/tfm_utils.h b/secure_fw/core/tfm_utils.h
similarity index 100%
rename from secure_fw/core/ipc/include/tfm_utils.h
rename to secure_fw/core/tfm_utils.h