Build: Follow the 'source_structure.rst'
This is the first patch to follow the first commit of source structure
document. The items under the 'secure_fw' folder are re-organized:
- Create/Move some folders/files to follow document.
- Rename some folders to foll, for example, 'secure_fw/services' to
'secure_fw/partitions'.
- Update affected files to make it work.
This is a big change, to make the structure meet the basic shape of
the structure document defined, and make it easier to be understood
for users. Staging changes are not applicable so they are combined
into one - and because it is not the final shape yet, so:
- Upcoming updates on the 'secure_fw' folder would follow up soon.
- Fine-tune about the 'source_structure.rst' would come, too.
Change-Id: I5c11175e0a4579cd9b42d3e3519dbffb87334d0b
Signed-off-by: Ken Liu <ken.liu@arm.com>
diff --git a/test/suites/attestation/CMakeLists.inc b/test/suites/attestation/CMakeLists.inc
index 2eb344f..76935fa 100644
--- a/test/suites/attestation/CMakeLists.inc
+++ b/test/suites/attestation/CMakeLists.inc
@@ -55,7 +55,7 @@
#Setting include directories
embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
- embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/services/initial_attestation ABSOLUTE)
+ embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/partitions/initial_attestation ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/qcbor/inc ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/qcbor/util ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/t_cose/inc ABSOLUTE)
diff --git a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
index b739b9a..e827ae2 100644
--- a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
+++ b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
@@ -7,7 +7,7 @@
#include "attestation_ns_tests.h"
#include "psa/initial_attestation.h"
-#include "secure_fw/services/initial_attestation/attestation.h"
+#include "attestation.h"
#include "../attestation_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/attestation/secure/attestation_s_interface_testsuite.c b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
index a01303b..0ff7df1 100644
--- a/test/suites/attestation/secure/attestation_s_interface_testsuite.c
+++ b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
@@ -7,7 +7,7 @@
#include "attestation_s_tests.h"
#include "psa/initial_attestation.h"
-#include "secure_fw/services/initial_attestation/attestation.h"
+#include "secure_fw/partitions/initial_attestation/attestation.h"
#include "../attestation_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/audit/non_secure/audit_ns_interface_testsuite.c b/test/suites/audit/non_secure/audit_ns_interface_testsuite.c
index 1dfe049..a6179ac 100644
--- a/test/suites/audit/non_secure/audit_ns_interface_testsuite.c
+++ b/test/suites/audit/non_secure/audit_ns_interface_testsuite.c
@@ -9,7 +9,7 @@
#include "psa_audit_api.h"
#include "audit_ns_tests.h"
#include "tfm_api.h"
-#include "secure_fw/services/audit_logging/audit_core.h"
+#include "secure_fw/partitions/audit_logging/audit_core.h"
#include "../audit_tests_common.h"
diff --git a/test/suites/audit/secure/audit_s_interface_testsuite.c b/test/suites/audit/secure/audit_s_interface_testsuite.c
index 7bda71e..550ec10 100644
--- a/test/suites/audit/secure/audit_s_interface_testsuite.c
+++ b/test/suites/audit/secure/audit_s_interface_testsuite.c
@@ -10,7 +10,7 @@
#include "audit_s_tests.h"
#include "tfm_api.h"
#include "psa_audit_api.h"
-#include "secure_fw/services/audit_logging/audit_core.h"
+#include "secure_fw/partitions/audit_logging/audit_core.h"
#include "../audit_tests_common.h"
diff --git a/test/suites/core/non_secure/core_ns_positive_testsuite.c b/test/suites/core/non_secure/core_ns_positive_testsuite.c
index 7d86dca..794e7d9 100644
--- a/test/suites/core/non_secure/core_ns_positive_testsuite.c
+++ b/test/suites/core/non_secure/core_ns_positive_testsuite.c
@@ -10,6 +10,7 @@
#include <string.h>
#include "core_ns_tests.h"
+#include "cmsis.h"
#include "tfm_api.h"
#include "tfm_plat_test.h"
#include "test/suites/core/non_secure/core_test_api.h"
diff --git a/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c b/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c
index 113fb4a..ec18eaa 100644
--- a/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c
+++ b/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c
@@ -8,8 +8,8 @@
#include "test_sst_nv_counters.h"
#include <limits.h>
-#include "secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h"
-#include "secure_fw/services/secure_storage/sst_utils.h"
+#include "secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h"
+#include "secure_fw/partitions/secure_storage/sst_utils.h"
#define DISABLE_INCREMENT 0
#define ENABLE_INCREMENT 1
diff --git a/test/suites/sst/secure/sst_rollback_protection_testsuite.c b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
index fbcdc04..bc9d19f 100644
--- a/test/suites/sst/secure/sst_rollback_protection_testsuite.c
+++ b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
@@ -9,7 +9,7 @@
#include <stdio.h>
-#include "secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h"
+#include "secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h"
#include "nv_counters/test_sst_nv_counters.h"
#include "psa/protected_storage.h"
#include "tfm_memory_utils.h"
diff --git a/test/test_services/CMakeLists.inc b/test/test_services/CMakeLists.inc
index c22a33b..f5e52d9 100644
--- a/test/test_services/CMakeLists.inc
+++ b/test/test_services/CMakeLists.inc
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2017-2019, Arm Limited. All rights reserved.
+# Copyright (c) 2017-2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -79,7 +79,7 @@
embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/platform/include ABSOLUTE)
-embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/include ABSOLUTE)
set(BUILD_CMSIS_CORE Off)
set(BUILD_RETARGET Off)
diff --git a/test/test_services/tfm_core_test/core_test_defs.h b/test/test_services/tfm_core_test/core_test_defs.h
index f1e07fb..819d2a8 100644
--- a/test/test_services/tfm_core_test/core_test_defs.h
+++ b/test/test_services/tfm_core_test/core_test_defs.h
@@ -15,7 +15,6 @@
#include <inttypes.h>
#include <limits.h>
#include "tfm_api.h"
-#include "tfm_core.h"
/* These definitions are used in symbols, only digits are permitted */
#define CORE_TEST_ID_NS_THREAD 1001
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 31dffa7..0a6d85e 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
@@ -12,8 +12,8 @@
#include "tfm_veneers.h"
#include "secure_utilities.h"
#include "tfm_secure_api.h"
-#include "secure_fw/include/tfm_spm_services_api.h"
-#include "spm_partition_defs.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/tfm_test_core.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 a242f71..18ea676 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,7 +10,7 @@
#include "tfm_ss_core_test_2.h"
#include "tfm_api.h"
#include "tfm_secure_api.h"
-#include "spm_partition_defs.h"
+#include "tfm/spm_partition_defs.h"
#include "psa/service.h"
#include "psa_manifest/tfm_test_core_2.h"
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 168d2a9..a8ffcf5 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
@@ -10,8 +10,8 @@
#include "tfm_veneers.h"
#include "secure_utilities.h"
#include "tfm_secure_api.h"
-#include "secure_fw/include/tfm_spm_services_api.h"
-#include "spm_partition_defs.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/tfm_irq_test_service_1.h"
diff --git a/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c b/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c
index 94ec3a9..0e43666 100644
--- a/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c
+++ b/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c
@@ -12,7 +12,7 @@
#include "psa/client.h"
#endif
-#include "secure_fw/services/secure_storage/sst_object_system.h"
+#include "secure_fw/partitions/secure_storage/sst_object_system.h"
psa_status_t tfm_sst_test_prepare(psa_invec *in_vec, size_t in_len,
psa_outvec *out_vec, size_t out_len)