aboutsummaryrefslogtreecommitdiffstats
path: root/plat
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-03-20 15:46:18 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-03-20 15:46:18 +0000
commit6e7b2036132825d9d3559fb71c973d064b1ba3ed (patch)
treef0668fb6a68286979c53ced772ed82073ca6d605 /plat
parent1d88b8fa8b592beb883e6c0eb5c7e094eb114638 (diff)
parent161dbc436424a4522a49b1e5cbac9e7bf84015f4 (diff)
downloadplatform_external_arm-trusted-firmware-6e7b2036132825d9d3559fb71c973d064b1ba3ed.tar.gz
platform_external_arm-trusted-firmware-6e7b2036132825d9d3559fb71c973d064b1ba3ed.tar.bz2
platform_external_arm-trusted-firmware-6e7b2036132825d9d3559fb71c973d064b1ba3ed.zip
Merge "fvp: use two instances of Cactus at S-EL1" into integration
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/board/fvp/fdts/fvp_fw_config.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/arm/board/fvp/fdts/fvp_fw_config.dts b/plat/arm/board/fvp/fdts/fvp_fw_config.dts
index 2f7832642..61bd69c17 100644
--- a/plat/arm/board/fvp/fdts/fvp_fw_config.dts
+++ b/plat/arm/board/fvp/fdts/fvp_fw_config.dts
@@ -102,12 +102,12 @@
secure-partitions {
compatible = "arm,sp";
- cactus {
+ cactus-primary {
uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>;
load-address = <0x7000000>;
};
- ivy {
+ cactus-secondary {
uuid = <0x092358d1 0xb94723f0 0x64447c82 0xc88f57f5>;
load-address = <0x7100000>;
};