aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2021-09-15 16:58:40 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-09-15 16:58:40 +0200
commitbe1eba51e979d92868c2700797f8b776ed600b5c (patch)
treea53e21e3d86fac456e82eaf36a17de0882dd02af
parente693013b4eeef549791e6a4ed6c4c6701cecad76 (diff)
parent38f79045775cb4c53348b9ca4899309ebfa51d08 (diff)
downloadtrusted-firmware-a-be1eba51e979d92868c2700797f8b776ed600b5c.tar.gz
Merge "refactor(tc): use internal trusted storage" into integration
-rw-r--r--docs/plat/arm/arm-build-options.rst2
-rw-r--r--plat/arm/board/tc/fdts/tc_spmc_optee_sp_manifest.dts2
-rw-r--r--plat/arm/board/tc/fdts/tc_tb_fw_config.dts8
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 74251bd287..339ebbe33e 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 34b4e74c35..92e2ddda67 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 28ed7ae945..af80550dbb 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 <lib/libc/cdefs.h>
+
/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 */
};
};