From 38f79045775cb4c53348b9ca4899309ebfa51d08 Mon Sep 17 00:00:00 2001 From: Davidson K Date: Tue, 10 Aug 2021 19:25:57 +0530 Subject: [PATCH] refactor(tc): use internal trusted storage Trusted Services had removed secure storage and added two new trusted services - Protected Storage and Internal Trusted Storage. Hence we are removing secure storage and adding support for the internal trusted storage. And enable external SP images in BL2 config for TC, so that we do not have to modify this file whenever the list of SPs changes. It is already implemented for fvp in the below commit. commit 33993a3737737a03ee5a9d386d0a027bdc947c9c Author: Balint Dobszay Date: Fri Mar 26 15:19:11 2021 +0100 feat(fvp): enable external SP images in BL2 config Change-Id: I3e0a0973df3644413ca5c3a32f36d44c8efd49c7 Signed-off-by: Davidson K --- docs/plat/arm/arm-build-options.rst | 2 +- plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts | 2 +- plat/arm/board/tc/fdts/tc_tb_fw_config.dts | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/plat/arm/arm-build-options.rst b/docs/plat/arm/arm-build-options.rst index 74251bd28..339ebbe33 100644 --- a/docs/plat/arm/arm-build-options.rst +++ b/docs/plat/arm/arm-build-options.rst @@ -108,7 +108,7 @@ Arm Platform Build Options file name contains pattern optee_sp. - ``TS_SP_FW_CONFIG``: DTC build flag to include Trusted Services (Crypto and - secure-storage) as SP in tb_fw_config device tree. + internal-trusted-storage) as SP in tb_fw_config device tree. - ``ARM_GPT_SUPPORT``: Enable GPT parser to get the entry address and length of the various partitions present in the GPT image. This support is available diff --git a/plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts b/plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts index 34b4e74c3..92e2ddda6 100644 --- a/plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts +++ b/plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts @@ -36,7 +36,7 @@ #ifdef TS_SP_FW_CONFIG vm2 { is_ffa_partition; - debug_name = "secure-storage"; + debug_name = "internal-trusted-storage"; load_address = <0xfee00000>; vcpu_count = <1>; mem_size = <2097152>; /* 2MB TZC DRAM */ diff --git a/plat/arm/board/tc/fdts/tc_tb_fw_config.dts b/plat/arm/board/tc/fdts/tc_tb_fw_config.dts index 28ed7ae94..af80550db 100644 --- a/plat/arm/board/tc/fdts/tc_tb_fw_config.dts +++ b/plat/arm/board/tc/fdts/tc_tb_fw_config.dts @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + /dts-v1/; / { @@ -27,8 +29,11 @@ secure-partitions { compatible = "arm,sp"; +#ifdef ARM_BL2_SP_LIST_DTS + #include __XSTRING(ARM_BL2_SP_LIST_DTS) +#else #ifdef TS_SP_FW_CONFIG - secure-storage { + internal-trusted-storage { uuid = "dc1eef48-b17a-4ccf-ac8b-dfcff7711b14"; load-address = <0xfee00000>; }; @@ -60,5 +65,6 @@ load-address = <0xfe200000>; }; #endif +#endif /* ARM_BL2_SP_LIST_DTS */ }; };