aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2021-09-06 18:09:37 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-09-06 18:09:37 +0200
commit2b9bfbc2b030c327e323377bb2821df1ff0e4f5c (patch)
tree22f811480c374dbd1f177b76c32e5ef7c239b8be /plat
parentf465cc1659fdbaf962217aa2f1767a511426b476 (diff)
parent33993a3737737a03ee5a9d386d0a027bdc947c9c (diff)
downloadtrusted-firmware-a-2b9bfbc2b030c327e323377bb2821df1ff0e4f5c.tar.gz
Merge "feat(fvp): enable external SP images in BL2 config" into integration
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts7
1 files changed, 7 insertions, 0 deletions
diff --git a/plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts b/plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts
index 62ab27c9df..08d3c32ea6 100644
--- a/plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts
+++ b/plat/arm/board/fvp/fdts/fvp_tb_fw_config.dts
@@ -4,6 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include <lib/libc/cdefs.h>
+
/dts-v1/;
/ {
@@ -74,6 +76,10 @@
secure-partitions {
compatible = "arm,sp";
+
+#ifdef ARM_BL2_SP_LIST_DTS
+ #include __XSTRING(ARM_BL2_SP_LIST_DTS)
+#else
#ifdef OPTEE_SP_FW_CONFIG
op-tee {
uuid = "486178e0-e7f8-11e3-bc5e-0002a5d5c51b";
@@ -104,6 +110,7 @@
owner = "Plat";
};
#endif
+#endif /* ARM_BL2_SP_LIST_DTS */
};
#if COT_DESC_IN_DTB