aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMingyang Sun <mingyang.sun@arm.com>2020-06-11 17:43:58 +0800
committerMingyang Sun <mingyang.sun@arm.com>2020-06-19 10:17:49 +0800
commitc3123ecc732c90de37042f59b5ce11f1bae7cbae (patch)
tree7a459202d04ff4706541d4653d0f4a5d4b52d8db /test
parentbd7ceb57864baf27bbcce02ed709f57a3bc825f7 (diff)
downloadtrusted-firmware-m-c3123ecc732c90de37042f59b5ce11f1bae7cbae.tar.gz
Core: Move spm header files to 'spm' folder
- Move 'spm_xxx.h' to 'spm' folder, they should belong to 'spm'. - Fix and simplify inclusion of header file. - Fix format and typo error. Change-Id: I129c6626ddffbbdba0e7edc27e9307f0d6ea9b79 Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_services/tfm_core_test/tfm_ss_core_test.c2
-rw-r--r--test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c2
-rw-r--r--test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/test_services/tfm_core_test/tfm_ss_core_test.c b/test/test_services/tfm_core_test/tfm_ss_core_test.c
index dbbdd442e1..6ec95be2cc 100644
--- a/test/test_services/tfm_core_test/tfm_ss_core_test.c
+++ b/test/test_services/tfm_core_test/tfm_ss_core_test.c
@@ -13,9 +13,9 @@
#include "secure_utilities.h"
#include "tfm_secure_api.h"
#include "secure_fw/include/tfm/tfm_spm_services_api.h"
-#include "tfm/spm_partition_defs.h"
#include "psa/service.h"
#include "tfm_plat_test.h"
+#include "psa_manifest/pid.h"
#include "psa_manifest/tfm_test_core.h"
#ifdef TFM_PSA_API
#include "psa_manifest/sid.h"
diff --git a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
index 18ea676b06..e9d8c958f2 100644
--- a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
+++ b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
@@ -10,8 +10,8 @@
#include "tfm_ss_core_test_2.h"
#include "tfm_api.h"
#include "tfm_secure_api.h"
-#include "tfm/spm_partition_defs.h"
#include "psa/service.h"
+#include "psa_manifest/pid.h"
#include "psa_manifest/tfm_test_core_2.h"
#define INVALID_NS_CLIENT_ID 0x49abcdef
diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
index 4be0801bfb..07f2560ae3 100644
--- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
+++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
@@ -11,9 +11,9 @@
#include "secure_utilities.h"
#include "tfm_secure_api.h"
#include "secure_fw/include/tfm/tfm_spm_services_api.h"
-#include "tfm/spm_partition_defs.h"
#include "test/test_services/tfm_core_test/core_test_defs.h"
#include "psa/service.h"
+#include "psa_manifest/pid.h"
#include "psa_manifest/tfm_irq_test_service_1.h"
#include "tfm_plat_test.h"