spm: move OP-TEE SP manifest DTS to FVP platform

Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I0981c43e2ef8172138f65d95eac7b20f8969394e

diff --git a/fdts/optee_sp_manifest.dts b/fdts/optee_sp_manifest.dts
deleted file mode 100644 (file)
index 928d0d3..0000000
--- a/fdts/optee_sp_manifest.dts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * This file is a Partition Manifest (PM) for a minimal Secure Partition (SP)
- * that has additional optional properties defined.
- *
- */
-
-/dts-v1/;
-
-/ {
-       compatible = "arm,ffa-manifest-1.0";
-
-       /* Properties */
-       description = "op-tee";
-       ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */
-       uuid = <0x486178e0 0xe7f811e3 0xbc5e0002 0xa5d5c51b>;
-       id = <1>;
-       execution-ctx-count = <8>;
-       exception-level = <2>; /* S-EL1 */
-       execution-state = <0>; /* AARCH64 */
-       load-address = <0x6280000>;
-       entrypoint-offset = <0x1000>;
-       xlat-granule = <0>; /* 4KiB */
-       boot-order = <0>;
-       messaging-method = <0>; /* Direct messaging only */
-       run-time-model = <1>; /* Run to completion */
-
-       /* Boot protocol */
-       gp-register-num = <0x0>;
-
-       device-regions {
-               compatible = "arm,ffa-manifest-device-regions";
-
-               uart1 {
-                       base-address = <0x00000000 0x1c0a0000>;
-                       pages-count = <1>;
-                       attributes = <0x3>; /* read-write */
-               };
-
-               gicd {
-                       base-address = <0x00000000 0x2f000000>;
-                       pages-count = <16>;
-                       attributes = <0x3>; /* read-write */
-               };
-       };
-};

diff --git a/plat/arm/board/fvp/fdts/optee_sp_manifest.dts b/plat/arm/board/fvp/fdts/optee_sp_manifest.dts
new file mode 100644 (file)
index 0000000..928d0d3
--- /dev/null
+++ b/plat/arm/board/fvp/fdts/optee_sp_manifest.dts
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * This file is a Partition Manifest (PM) for a minimal Secure Partition (SP)
+ * that has additional optional properties defined.
+ *
+ */
+
+/dts-v1/;
+
+/ {
+       compatible = "arm,ffa-manifest-1.0";
+
+       /* Properties */
+       description = "op-tee";
+       ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */
+       uuid = <0x486178e0 0xe7f811e3 0xbc5e0002 0xa5d5c51b>;
+       id = <1>;
+       execution-ctx-count = <8>;
+       exception-level = <2>; /* S-EL1 */
+       execution-state = <0>; /* AARCH64 */
+       load-address = <0x6280000>;
+       entrypoint-offset = <0x1000>;
+       xlat-granule = <0>; /* 4KiB */
+       boot-order = <0>;
+       messaging-method = <0>; /* Direct messaging only */
+       run-time-model = <1>; /* Run to completion */
+
+       /* Boot protocol */
+       gp-register-num = <0x0>;
+
+       device-regions {
+               compatible = "arm,ffa-manifest-device-regions";
+
+               uart1 {
+                       base-address = <0x00000000 0x1c0a0000>;
+                       pages-count = <1>;
+                       attributes = <0x3>; /* read-write */
+               };
+
+               gicd {
+                       base-address = <0x00000000 0x2f000000>;
+                       pages-count = <16>;
+                       attributes = <0x3>; /* read-write */
+               };
+       };
+};