Interface: Rename PSA headers
Renames PSA headers from psa_<api>.h to psa/<api>.h.
Change-Id: I3fc552c39f9a7e6d54e7a7a2f82f076bd03d30a7
Signed-off-by: Jamie Fox <jamie.fox@arm.com>
diff --git a/secure_fw/services/initial_attestation/attestation.h b/secure_fw/services/initial_attestation/attestation.h
index f73ed0f..6a2fe0c 100644
--- a/secure_fw/services/initial_attestation/attestation.h
+++ b/secure_fw/services/initial_attestation/attestation.h
@@ -8,7 +8,7 @@
#ifndef __ATTESTATION_H__
#define __ATTESTATION_H__
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "tfm_client.h"
#include "bl2/include/tfm_boot_status.h"
diff --git a/secure_fw/services/initial_attestation/attestation_key.c b/secure_fw/services/initial_attestation/attestation_key.c
index f122542..12e86cd 100644
--- a/secure_fw/services/initial_attestation/attestation_key.c
+++ b/secure_fw/services/initial_attestation/attestation_key.c
@@ -8,7 +8,7 @@
#include "attestation_key.h"
#include <stdint.h>
#include <stddef.h>
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "platform/include/tfm_plat_defs.h"
#include "platform/include/tfm_plat_crypto_keys.h"
diff --git a/secure_fw/services/initial_attestation/attestation_key.h b/secure_fw/services/initial_attestation/attestation_key.h
index e9f3916..94c1d7e 100644
--- a/secure_fw/services/initial_attestation/attestation_key.h
+++ b/secure_fw/services/initial_attestation/attestation_key.h
@@ -8,8 +8,8 @@
#ifndef __ATTESTATION_KEY_H__
#define __ATTESTATION_KEY_H__
-#include "psa_initial_attestation_api.h"
-#include "psa_crypto.h"
+#include "psa/initial_attestation.h"
+#include "psa/crypto.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/services/initial_attestation/tfm_attestation.c b/secure_fw/services/initial_attestation/tfm_attestation.c
index f4b1acd..1b8757a 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation.c
@@ -8,7 +8,7 @@
#include "tfm_api.h"
#include "tfm_secure_api.h"
#include "attestation.h"
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "bl2/include/tfm_boot_status.h"
#ifdef TFM_PSA_API
diff --git a/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c b/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
index d899bc6..97042bd 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
@@ -6,13 +6,13 @@
*/
#include <string.h>
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "attestation.h"
#ifdef TFM_PSA_API
#include "tfm_attest_signal.h"
#include "tfm_client.h"
-#include "psa_service.h"
+#include "psa/service.h"
#include "region_defs.h"
#define IOVEC_LEN(x) (sizeof(x)/sizeof(x[0]))
diff --git a/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c b/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
index d403839..1e426d7 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
@@ -5,7 +5,7 @@
*
*/
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
#include "tfm_veneers.h"
#include "tfm_memory_utils.h"
#include "tfm_client.h"
diff --git a/secure_fw/services/initial_attestation/tfm_client.h b/secure_fw/services/initial_attestation/tfm_client.h
index 78adb0d..9de6ae4 100644
--- a/secure_fw/services/initial_attestation/tfm_client.h
+++ b/secure_fw/services/initial_attestation/tfm_client.h
@@ -8,13 +8,13 @@
#ifndef __TFM_CLIENT_H__
#define __TFM_CLIENT_H__
-#include "psa_client.h" /* psa_invec, psa_outvec */
+#include "psa/client.h" /* psa_invec, psa_outvec */
#ifdef __cplusplus
extern "C" {
#endif
-/* Intentionally empty, the aim of this file to include psa_client.h, which
+/* Intentionally empty, the aim of this file to include psa/client.h, which
* contains the psa_invec and psa_outvec definitions in TF-M project, but these
* might has different location in another projects.
*/