SPM: Remove 'init' and 'runtime' folder in 'spm/common'
The 'init' was proposed for 'booting' and the 'runtime' was for SPM
runtime usage. These folders are historic items which not following
the structure document, remove them.
Change-Id: I2e9876b992f98325c9f376f899a7ed288ed04b95
Signed-off-by: Summer Qin <summer.qin@arm.com>
diff --git a/secure_fw/spm/cmsis_func/CMakeLists.inc b/secure_fw/spm/cmsis_func/CMakeLists.inc
index 5555d61..1fb4f39 100644
--- a/secure_fw/spm/cmsis_func/CMakeLists.inc
+++ b/secure_fw/spm/cmsis_func/CMakeLists.inc
@@ -30,19 +30,18 @@
#Get the current directory where this file is located.
set(SFW_FUNC_SPM_DIR ${CMAKE_CURRENT_LIST_DIR})
set(SFW_SPM_DIR "${SFW_FUNC_SPM_DIR}/..")
-set(SFW_SPM_INIT_DIR "${SFW_SPM_DIR}/common/init")
-set(SFW_SPM_RUNTIME_DIR "${SFW_SPM_DIR}/common/runtime")
+set(SFW_SPM_COMMON_DIR "${SFW_SPM_DIR}/common")
set (SFW_FUNC_SPM_SRC
- "${SFW_SPM_INIT_DIR}/tfm_boot_data.c"
+ "${SFW_SPM_COMMON_DIR}/tfm_boot_data.c"
+ "${SFW_SPM_COMMON_DIR}/tfm_core_mem_check.c"
+ "${SFW_SPM_COMMON_DIR}/tfm_core_utils.c"
+ "${SFW_SPM_COMMON_DIR}/utilities.c"
"${SFW_FUNC_SPM_DIR}/main.c"
"${SFW_FUNC_SPM_DIR}/tfm_core_svcalls_func.c"
"${SFW_FUNC_SPM_DIR}/tfm_secure_api.c"
"${SFW_FUNC_SPM_DIR}/spm_func.c"
"${SFW_FUNC_SPM_DIR}/tfm_nspm_func.c"
- "${SFW_SPM_RUNTIME_DIR}/utilities.c"
- "${SFW_SPM_RUNTIME_DIR}/tfm_core_mem_check.c"
- "${SFW_SPM_RUNTIME_DIR}/tfm_core_utils.c"
"${SFW_FUNC_SPM_DIR}/tfm_veneers.c"
"${SFW_FUNC_SPM_DIR}/arch.c"
)
diff --git a/secure_fw/spm/cmsis_psa/CMakeLists.inc b/secure_fw/spm/cmsis_psa/CMakeLists.inc
index e2d7b1a..637bf5d 100644
--- a/secure_fw/spm/cmsis_psa/CMakeLists.inc
+++ b/secure_fw/spm/cmsis_psa/CMakeLists.inc
@@ -31,17 +31,16 @@
set(SFW_IPC_SPM_DIR ${CMAKE_CURRENT_LIST_DIR})
set(SFW_SPM_DIR "${SFW_IPC_SPM_DIR}/..")
set(SFW_SPM_ARCH_DIR "${SFW_IPC_SPM_DIR}/arch")
-set(SFW_SPM_INIT_DIR "${SFW_SPM_DIR}/common/init")
-set(SFW_SPM_RUNTIME_DIR "${SFW_SPM_DIR}/common/runtime")
+set(SFW_SPM_COMMON_DIR "${SFW_SPM_DIR}/common")
set (SFW_IPC_SPM_SRC
- "${SFW_SPM_INIT_DIR}/tfm_boot_data.c"
+ "${SFW_SPM_COMMON_DIR}/tfm_boot_data.c"
+ "${SFW_SPM_COMMON_DIR}/tfm_core_utils.c"
+ "${SFW_SPM_COMMON_DIR}/utilities.c"
"${SFW_IPC_SPM_DIR}/main.c"
"${SFW_IPC_SPM_DIR}/spm_ipc.c"
"${SFW_IPC_SPM_DIR}/spm_psa_client_call.c"
"${SFW_IPC_SPM_DIR}/tfm_core_svcalls_ipc.c"
- "${SFW_SPM_RUNTIME_DIR}/utilities.c"
- "${SFW_SPM_RUNTIME_DIR}/tfm_core_utils.c"
"${SFW_IPC_SPM_DIR}/tfm_pools.c"
"${SFW_IPC_SPM_DIR}/tfm_thread.c"
"${SFW_IPC_SPM_DIR}/tfm_wait.c"
@@ -56,7 +55,7 @@
else ()
list(APPEND SFW_IPC_SPM_SRC "${SFW_IPC_SPM_DIR}/tfm_nspm_ipc.c"
"${SFW_IPC_SPM_DIR}/tfm_psa_api_veneers.c"
- "${SFW_SPM_RUNTIME_DIR}/tfm_core_mem_check.c"
+ "${SFW_SPM_COMMON_DIR}/tfm_core_mem_check.c"
)
endif ()
diff --git a/secure_fw/spm/common/init/tfm_boot_data.c b/secure_fw/spm/common/tfm_boot_data.c
similarity index 100%
rename from secure_fw/spm/common/init/tfm_boot_data.c
rename to secure_fw/spm/common/tfm_boot_data.c
diff --git a/secure_fw/spm/common/runtime/tfm_core_mem_check.c b/secure_fw/spm/common/tfm_core_mem_check.c
similarity index 100%
rename from secure_fw/spm/common/runtime/tfm_core_mem_check.c
rename to secure_fw/spm/common/tfm_core_mem_check.c
diff --git a/secure_fw/spm/common/runtime/tfm_core_utils.c b/secure_fw/spm/common/tfm_core_utils.c
similarity index 100%
rename from secure_fw/spm/common/runtime/tfm_core_utils.c
rename to secure_fw/spm/common/tfm_core_utils.c
diff --git a/secure_fw/spm/common/runtime/utilities.c b/secure_fw/spm/common/utilities.c
similarity index 100%
rename from secure_fw/spm/common/runtime/utilities.c
rename to secure_fw/spm/common/utilities.c