commit 484513bedcead8de3244ab256c17c1eba4837eaa
author Summer Qin <summer.qin@arm.com> Sun Oct 09 17:40:24 2022 +0800
committer Summer Qin <summer.qin@arm.com> Fri Oct 21 17:19:58 2022 +0800
tree dcf1e56b201d8a17005836e397c42a050473c9fb
parent 566e03baf36ec92d276c13e8839d50bc1c6e25a4

SPM: Remove Library Model codes

Library Model is deprecated, so remove the related codes in TF-M.

Signed-off-by: Summer Qin <summer.qin@arm.com>
Change-Id: I954d3b4f4fb8bbf70953043358203f3dc34567c6

secure_fw/partitions/lib/runtime/service_api.c

diff --git a/secure_fw/partitions/lib/runtime/service_api.c b/secure_fw/partitions/lib/runtime/service_api.c
index 8d57f2c..1ed1ad9 100644
--- a/secure_fw/partitions/lib/runtime/service_api.c
+++ b/secure_fw/partitions/lib/runtime/service_api.c
@@ -7,12 +7,8 @@
 
 #include "cmsis_compiler.h"
 #include "service_api.h"
-#ifdef TFM_PSA_API
 #include "psa/service.h"
 #include "svc_num.h"
-#else
-#include "tfm_core_svc.h"
-#endif /* TFM_PSA_API */
 #include "utilities.h"
 
 __attribute__((naked))
@@ -26,7 +22,7 @@
         );
 }
 
-#if defined TFM_PSA_API && TFM_LVL != 1
+#if TFM_LVL != 1
 /* Entry point when Partition FLIH functions return */
 __attribute__((naked))
 void tfm_flih_func_return(psa_flih_result_t result)
@@ -34,4 +30,4 @@
     __ASM volatile("SVC "M2S(TFM_SVC_FLIH_FUNC_RETURN)"           \n"
                    );
 }
-#endif /* TFM_PSA_API && TFM_LVL != 1 */
+#endif /* TFM_LVL != 1 */