diff options
author | Mingyang Sun <mingyang.sun@arm.com> | 2021-07-26 16:13:34 +0800 |
---|---|---|
committer | Mingyang Sun <mingyang.sun@arm.com> | 2021-08-09 04:01:50 +0200 |
commit | 1e5ba9bc1f7ef7d471e894e30bf5b3924e923446 (patch) | |
tree | 020f7164c6d72b0766220d39c9ee792a26c68b76 /secure_fw/partitions/tfm_ffm11_partition | |
parent | eeca465fb308056be30c773a3aa7be63e7a62b56 (diff) | |
download | trusted-firmware-m-1e5ba9bc1f7ef7d471e894e30bf5b3924e923446.tar.gz |
Services: Remove the "ffm11" partition
The partition only includes one stateless service accessing
test. Remove this partition and put the test into IPC service
test partition.
Same changes are applied to the tf-m-test repo.
Change-Id: I37e2fabce61fe2a366bfea209d97d2968fdb5325
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
Diffstat (limited to 'secure_fw/partitions/tfm_ffm11_partition')
3 files changed, 0 insertions, 178 deletions
diff --git a/secure_fw/partitions/tfm_ffm11_partition/CMakeLists.txt b/secure_fw/partitions/tfm_ffm11_partition/CMakeLists.txt deleted file mode 100644 index b3870d63c9..0000000000 --- a/secure_fw/partitions/tfm_ffm11_partition/CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ - -#------------------------------------------------------------------------------- -# Copyright (c) 2021, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# -#------------------------------------------------------------------------------- -if (NOT TFM_PARTITION_FFM11) - return() -endif() - -cmake_minimum_required(VERSION 3.15) -cmake_policy(SET CMP0079 NEW) - -add_library(tfm_app_rot_partition_ffm11 STATIC) - -target_sources(tfm_app_rot_partition_ffm11 - PRIVATE - tfm_ffm11_partition.c -) - -# The generated sources -target_sources(tfm_app_rot_partition_ffm11 - PRIVATE - ${CMAKE_BINARY_DIR}/generated/secure_fw/partitions/tfm_ffm11_partition/auto_generated/intermedia_tfm_ffm11_partition.c -) -target_sources(tfm_partitions - INTERFACE - $<$<BOOL:${TFM_PSA_API}>: - ${CMAKE_BINARY_DIR}/generated/secure_fw/partitions/tfm_ffm11_partition/auto_generated/load_info_tfm_ffm11_partition.c> -) - -# Set include directory -target_include_directories(tfm_app_rot_partition_ffm11 - PRIVATE - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - ${CMAKE_BINARY_DIR}/generated/secure_fw/partitions/tfm_ffm11_partition -) -target_include_directories(tfm_partitions - INTERFACE - ${CMAKE_BINARY_DIR}/generated/secure_fw/partitions/tfm_ffm11_partition -) - -target_link_libraries(tfm_app_rot_partition_ffm11 - PRIVATE - tfm_secure_api - psa_interface - platform_s - tfm_sprt -) - -############################ Partition Defs #################################### -target_link_libraries(tfm_partitions - INTERFACE - tfm_app_rot_partition_ffm11 -) -target_compile_definitions(tfm_partition_defs - INTERFACE - TFM_PARTITION_FFM11 -) diff --git a/secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.c b/secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.c deleted file mode 100644 index d7f5be0678..0000000000 --- a/secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.c +++ /dev/null @@ -1,73 +0,0 @@ - -/* - * Copyright (c) 2021, Arm Limited. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - * - */ - -#include <stdint.h> -#include "psa/service.h" -#include "psa_manifest/tfm_ffm11_partition.h" -#include "tfm/tfm_spm_services.h" -#include "tfm_sp_log.h" - -/** - * \brief An example service implementation that prints out a message. - */ -static void tfm_ffm11_service1(void) -{ - psa_status_t status; - uint32_t arg; - psa_msg_t msg; - size_t num; - - /* Retrieve the message corresponding to the example service signal */ - status = psa_get(TFM_FFM11_SERVICE1_SIGNAL, &msg); - if (status != PSA_SUCCESS) { - return; - } - - /* Decode the message */ - switch (msg.type) { - case PSA_IPC_CALL: - if (msg.in_size[0] != sizeof(arg)) { - status = PSA_ERROR_PROGRAMMER_ERROR; - break; - } - /* Print arg from client */ - num = psa_read(msg.handle, 0, &arg, sizeof(arg)); - if (num != msg.in_size[0]) { - status = PSA_ERROR_PROGRAMMER_ERROR; - break; - } - LOG_INFFMT("[Example FFM11 partition] Service called! arg=%x\r\n", arg); - status = PSA_SUCCESS; - break; - default: - /* Invalid message type */ - status = PSA_ERROR_PROGRAMMER_ERROR; - break; - } - /* Reply with the message result status to unblock the client */ - psa_reply(msg.handle, status); -} - -/** - * \brief The example FFM-1.1 partition's entry function. - */ -void tfm_ffm11_partition_main(void) -{ - psa_signal_t signals; - - while (1) { - signals = psa_wait(PSA_WAIT_ANY, PSA_BLOCK); - if (signals & TFM_FFM11_SERVICE1_SIGNAL) { - tfm_ffm11_service1(); - } - /* - * The other services are created in yaml for testing manifest tool, - * but not handled here. They are reserved for future use. - */ - } -} diff --git a/secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.yaml b/secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.yaml deleted file mode 100644 index 9efdd7cb02..0000000000 --- a/secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.yaml +++ /dev/null @@ -1,45 +0,0 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2021, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# -#------------------------------------------------------------------------------- - -{ - "psa_framework_version": 1.1, - "name": "TFM_SP_FFM11", - "type": "APPLICATION-ROT", - "priority": "NORMAL", - "model": "IPC", - "entry_point": "tfm_ffm11_partition_main", - "stack_size": "0x200", - "services": [ - { - "name": "TFM_FFM11_SERVICE1", - "sid": "0x0000F120", - "non_secure_clients": true, - "connection_based": false, - "stateless_handle": 4, - "version": 1, - "version_policy": "RELAXED" - }, - { - "name": "TFM_FFM11_SERVICE2", - "sid": "0x0000F121", - "non_secure_clients": true, - "connection_based": false, - "stateless_handle": "auto", - "version": 1, - "version_policy": "RELAXED" - }, - { - "name": "TFM_FFM11_SERVICE3", - "sid": "0x0000F122", - "non_secure_clients": true, - "connection_based": false, - "stateless_handle": 3, - "version": 1, - "version_policy": "RELAXED" - } - ], -} |