Move SPM_PANIC to psa/service.h

TESTS/psa/spm_client/COMPONENT_SPE/client_tests_partition.c

@@ -19,15 +19,6 @@
 #include "psa/service.h"
 #include "psa_client_tests_part1_partition.h"
 
-#if defined(TARGET_MBED_SPM)
-#include "spm_panic.h"
-#else
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
-
 #define MSG_BUF_SIZE 128
 uint8_t data[MSG_BUF_SIZE] = {0};
 

TESTS/psa/spm_server/COMPONENT_SPE/server_tests_partition1.c

@@ -21,15 +21,6 @@
 #include "psa_server_tests_part1_partition.h"
 #include "server_tests.h"
 
-#if defined(TARGET_MBED_SPM)
-#include "spm_panic.h"
-#else
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
-
 extern psa_test_server_side_func test_list[];
 static size_t num_of_tests = 0;
 static psa_msg_t msg = {0};

TESTS/psa/spm_server/COMPONENT_SPE/tests.c

@@ -22,15 +22,6 @@
 #include "psa_server_tests_part2_ifs.h"
 #include "server_tests.h"
 
-#if defined(TARGET_MBED_SPM)
-#include "spm_panic.h"
-#else
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
-
 /**
  * Process a generic connect message to TEST ROT_SRV.
  * @return PSA_SUCCESS or negative error code if failed.

TESTS/psa/spm_smoke/COMPONENT_SPE/smoke_tests_partition.c

@@ -23,15 +23,6 @@
 #include "psa/service.h"
 #include "psa_smoke_tests_part1_partition.h"
 
-#if defined(TARGET_MBED_SPM)
-#include "spm_panic.h"
-#else
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
-
 // ------------------------------------ Definitions ----------------------------------
 
 #define SERVER_READ_MSG_BUF_SIZE        30

components/TARGET_PSA/inc/psa/service.h

@@ -17,6 +17,10 @@
 
 #if defined(TARGET_TFM)
 #include "interface/include/psa_service.h"
+#define SPM_PANIC(format, ...) \
+{ \
+    while(1){}; \
+}
 #else
 #include "TARGET_MBED_SPM/psa_defs.h"
 #include "TARGET_MBED_SPM/COMPONENT_SPE/spm_server.h"

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c

@@ -1,16 +1,9 @@
 // ---------------------------------- Includes ---------------------------------
 #include <stdint.h>
 #include <string.h>
-
 #include "psa/service.h"
 #include "psa/client.h"
 
-#if defined(TARGET_TFM)
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
 
 #define PSA_CRYPTO_SECURE 1
 #include "crypto_spe.h"

components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c

@@ -20,13 +20,6 @@
 #include "psa/internal_trusted_storage.h"
 #include "psa/service.h"
 
-#if defined(TARGET_TFM)
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
-
 typedef psa_status_t (*SignalHandler)(psa_msg_t *);
 
 static psa_status_t lifecycle_get(psa_msg_t *msg)

components/TARGET_PSA/services/storage/its/COMPONENT_SPE/its_partition.c

@@ -25,7 +25,6 @@
 
 #if defined(TARGET_MBED_SPM)
 #include "kv_config.h"
-
 #endif
 
 #ifdef   __cplusplus
@@ -33,13 +32,6 @@ extern "C"
 {
 #endif
 
-#if defined(TARGET_TFM)
-#define SPM_PANIC(format, ...) \
-{ \
-    while(1){}; \
-}
-#endif
-
 typedef psa_status_t (*SignalHandler)(psa_msg_t *);
 
 static psa_status_t storage_set(psa_msg_t *msg)