diff options
author | Kevin Peng <kevin.peng@arm.com> | 2020-07-08 17:50:09 +0800 |
---|---|---|
committer | Kevin Peng <kevin.peng@arm.com> | 2020-08-13 10:38:40 +0800 |
commit | b3a70456151eec3b4cd74505e6a76b3b5756a731 (patch) | |
tree | a13c1fcaa430559c70135cf74984751eaf5d50de /secure_fw | |
parent | af4e9be30a5d392927042306b7a88e997a412907 (diff) | |
download | trusted-firmware-m-b3a70456151eec3b4cd74505e6a76b3b5756a731.tar.gz |
Test: Remove test from TF-M
This patch removes the test code in TF-M. The codes should have
been moved to the tf-m-tests repo.
This patch also contains changes to make compilation work:
1. Update the TEST_DIR
2. Update manifest list and re-generate the manifests
3. Add necessary include path to build
Note:
This patch only intends to remove the test codes.
There are some intentional "workaround like" changes such as the
include paths.
They will be refined in the future.
Change-Id: I8d301e1d8f4fc7818b45c1b5ebf938a6b721f061
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Diffstat (limited to 'secure_fw')
-rw-r--r-- | secure_fw/partitions/tfm_service_list.inc | 16 | ||||
-rw-r--r-- | secure_fw/spm/cmsis_func/tfm_secure_irq_handlers.inc | 16 | ||||
-rw-r--r-- | secure_fw/spm/cmsis_psa/tfm_secure_irq_handlers_ipc.inc | 16 |
3 files changed, 24 insertions, 24 deletions
diff --git a/secure_fw/partitions/tfm_service_list.inc b/secure_fw/partitions/tfm_service_list.inc index a9fe93dd3e..4800ae32a2 100644 --- a/secure_fw/partitions/tfm_service_list.inc +++ b/secure_fw/partitions/tfm_service_list.inc @@ -16,14 +16,14 @@ #include "secure_fw/partitions/crypto/psa_manifest/tfm_crypto.h" #include "secure_fw/partitions/platform/psa_manifest/tfm_platform.h" #include "secure_fw/partitions/initial_attestation/psa_manifest/tfm_initial_attestation.h" -#include "test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h" -#include "test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h" -#include "test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h" -#include "test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h" -#include "test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h" -#include "test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h" -#include "test/test_services/tfm_ps_test_service/psa_manifest/tfm_ps_test_service.h" -#include "test/test_services/tfm_secure_client_2/psa_manifest/tfm_secure_client_2.h" +#include "../tf-m-tests/test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h" +#include "../tf-m-tests/test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h" +#include "../tf-m-tests/test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h" +#include "../tf-m-tests/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h" +#include "../tf-m-tests/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h" +#include "../tf-m-tests/test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h" +#include "../tf-m-tests/test/test_services/tfm_ps_test_service/psa_manifest/tfm_ps_test_service.h" +#include "../tf-m-tests/test/test_services/tfm_secure_client_2/psa_manifest/tfm_secure_client_2.h" const struct tfm_spm_service_db_t service_db[] = { diff --git a/secure_fw/spm/cmsis_func/tfm_secure_irq_handlers.inc b/secure_fw/spm/cmsis_func/tfm_secure_irq_handlers.inc index 88997f237a..78e113e73e 100644 --- a/secure_fw/spm/cmsis_func/tfm_secure_irq_handlers.inc +++ b/secure_fw/spm/cmsis_func/tfm_secure_irq_handlers.inc @@ -13,14 +13,14 @@ #include "secure_fw/partitions/crypto/psa_manifest/tfm_crypto.h" #include "secure_fw/partitions/platform/psa_manifest/tfm_platform.h" #include "secure_fw/partitions/initial_attestation/psa_manifest/tfm_initial_attestation.h" -#include "test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h" -#include "test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h" -#include "test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h" -#include "test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h" -#include "test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h" -#include "test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h" -#include "test/test_services/tfm_ps_test_service/psa_manifest/tfm_ps_test_service.h" -#include "test/test_services/tfm_secure_client_2/psa_manifest/tfm_secure_client_2.h" +#include "../tf-m-tests/test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h" +#include "../tf-m-tests/test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h" +#include "../tf-m-tests/test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h" +#include "../tf-m-tests/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h" +#include "../tf-m-tests/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h" +#include "../tf-m-tests/test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h" +#include "../tf-m-tests/test/test_services/tfm_ps_test_service/psa_manifest/tfm_ps_test_service.h" +#include "../tf-m-tests/test/test_services/tfm_secure_client_2/psa_manifest/tfm_secure_client_2.h" #include "psa_manifest/pid.h" /* Definitions of the signals of the IRQs */ diff --git a/secure_fw/spm/cmsis_psa/tfm_secure_irq_handlers_ipc.inc b/secure_fw/spm/cmsis_psa/tfm_secure_irq_handlers_ipc.inc index 5a5e7d04a0..bdd6defaa1 100644 --- a/secure_fw/spm/cmsis_psa/tfm_secure_irq_handlers_ipc.inc +++ b/secure_fw/spm/cmsis_psa/tfm_secure_irq_handlers_ipc.inc @@ -13,14 +13,14 @@ #include "secure_fw/partitions/crypto/psa_manifest/tfm_crypto.h" #include "secure_fw/partitions/platform/psa_manifest/tfm_platform.h" #include "secure_fw/partitions/initial_attestation/psa_manifest/tfm_initial_attestation.h" -#include "test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h" -#include "test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h" -#include "test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h" -#include "test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h" -#include "test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h" -#include "test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h" -#include "test/test_services/tfm_ps_test_service/psa_manifest/tfm_ps_test_service.h" -#include "test/test_services/tfm_secure_client_2/psa_manifest/tfm_secure_client_2.h" +#include "../tf-m-tests/test/test_services/tfm_core_test/psa_manifest/tfm_test_core.h" +#include "../tf-m-tests/test/test_services/tfm_core_test_2/psa_manifest/tfm_test_core_2.h" +#include "../tf-m-tests/test/test_services/tfm_secure_client_service/psa_manifest/tfm_test_client_service.h" +#include "../tf-m-tests/test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h" +#include "../tf-m-tests/test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h" +#include "../tf-m-tests/test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h" +#include "../tf-m-tests/test/test_services/tfm_ps_test_service/psa_manifest/tfm_ps_test_service.h" +#include "../tf-m-tests/test/test_services/tfm_secure_client_2/psa_manifest/tfm_secure_client_2.h" #include "cmsis_compiler.h" /* Definitions of the signals of the IRQs (if any) */ |