andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "refactor(tc): use internal trusted storage" into integration

This commit is contained in:
Olivier Deprez 2021-09-15 16:58:40 +02:00 committed by TrustedFirmware Code Review
parent e693013b4e 38f7904577
commit be1eba51e9
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/plat/arm/arm-build-options.rst
View File

@ -108,7 +108,7 @@ Arm Platform Build Options
file name contains pattern optee_sp. file name contains pattern optee_sp.
- ``TS_SP_FW_CONFIG``: DTC build flag to include Trusted Services (Crypto and - ``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 - ``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 the various partitions present in the GPT image. This support is available

2
plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts
View File

@ -36,7 +36,7 @@
#ifdef TS_SP_FW_CONFIG #ifdef TS_SP_FW_CONFIG
vm2 { vm2 {
is_ffa_partition; is_ffa_partition;
debug_name = "secure-storage"; debug_name = "internal-trusted-storage";
load_address = <0xfee00000>; load_address = <0xfee00000>;
vcpu_count = <1>; vcpu_count = <1>;
mem_size = <2097152>; /* 2MB TZC DRAM */ mem_size = <2097152>; /* 2MB TZC DRAM */

8
plat/arm/board/tc/fdts/tc_tb_fw_config.dts
View File

@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <lib/libc/cdefs.h>
/dts-v1/; /dts-v1/;
/ { / {
@ -27,8 +29,11 @@
secure-partitions { secure-partitions {
compatible = "arm,sp"; compatible = "arm,sp";
#ifdef ARM_BL2_SP_LIST_DTS
#include __XSTRING(ARM_BL2_SP_LIST_DTS)
#else
#ifdef TS_SP_FW_CONFIG #ifdef TS_SP_FW_CONFIG
secure-storage { internal-trusted-storage {
uuid = "dc1eef48-b17a-4ccf-ac8b-dfcff7711b14"; uuid = "dc1eef48-b17a-4ccf-ac8b-dfcff7711b14";
load-address = <0xfee00000>; load-address = <0xfee00000>;
}; };
@ -60,5 +65,6 @@
load-address = <0xfe200000>; load-address = <0xfe200000>;
}; };
#endif #endif
#endif /* ARM_BL2_SP_LIST_DTS */
}; };
}; };