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

interface/CMakeLists.txt

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index cbbb117..6558b3d 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -45,7 +45,6 @@
 
 target_compile_definitions(psa_interface
     INTERFACE
-        TFM_PSA_API
         $<$<BOOL:${CONFIG_TFM_ENABLE_CTX_MGMT}>:CONFIG_TFM_ENABLE_CTX_MGMT>
         $<$<BOOL:${TFM_ISOLATION_LEVEL}>:TFM_LVL=${TFM_ISOLATION_LEVEL}>
         $<$<BOOL:${CONFIG_TFM_USE_TRUSTZONE}>:CONFIG_TFM_USE_TRUSTZONE>

interface/include/psa_config.h

diff --git a/interface/include/psa_config.h b/interface/include/psa_config.h
index bd2cf5b..0fc166c 100644
--- a/interface/include/psa_config.h
+++ b/interface/include/psa_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -24,10 +24,8 @@
  */
 #if defined(CONFIG_TFM_BUILDING_SPE)
 
-#ifdef TFM_PSA_API
 /* SPE has specific configurations. */
 #include "config_impl.h"
-#endif /* TFM_PSA_API */
 
 #include "psa_interface_redirect.h"
 

interface/include/tfm_api.h

diff --git a/interface/include/tfm_api.h b/interface/include/tfm_api.h
index 1d4c9ee..7e79746 100644
--- a/interface/include/tfm_api.h
+++ b/interface/include/tfm_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -59,31 +59,9 @@
     TFM_ERROR_GENERIC = 0x1F,
 };
 
-/*
- * Structure to package type, in_len and out_len, it is mainly used for
- * psa_call.
- */
-struct tfm_control_parameter_t {
-   int32_t type;
-   size_t in_len;
-   size_t out_len;
-};
-
 /********************* Secure function declarations ***************************/
 
 /**
- * \brief Assign client ID to the current TZ context.
- *
- * \param[in] ns_client_id      The client ID to be assigned to the current
- *                              context.
- * \retval TFM_SUCCESS          The client ID assigned successfully.
- * \retval error code           The client ID assignment failed, an error code
- *                              returned according to \ref tfm_status_e.
- * \note This function have to be called from handler mode.
- */
-enum tfm_status_e tfm_register_client_id (int32_t ns_client_id);
-
-/**
  * \brief Retrieve the version of the PSA Framework API that is implemented.
  *
  * \return The version of the PSA Framework.