fix(ff-a): remove test regions from SP manifests
The device test regions were used in early prototyping but no longer
necessary now. The first cactus instance covers the device region
mapping feature. This change also eliminates warning logs from the TF-A
CI about non-existent SMMU id:
WARNING: SMMUv3: Unexpected smmu-id:1 specified in manifest
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: Idb081c50d76f555360d25a219ac7a5a74c834b87
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
index 17ace6f..717eeb9 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
@@ -71,21 +71,4 @@
attributes = <0x7>; /* read-write-execute */
};
};
-
- device-regions {
- compatible = "arm,ffa-manifest-device-regions";
-
- test-reg {
- /* Dummy values */
- base-address = <0x00000000 0x24000000>;
- pages-count = <16>;
- attributes = <0x3>; /* read-write */
- reg = <0x10000008 0x00000001 1>;
- smmu-id = <1>;
- stream-ids = <0x0 0x1>;
- interrupts = <0x2 0x3>,
- <0x4 0x5>;
- };
- };
-
};
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
index 88a5c3f..4802d12 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
@@ -51,21 +51,4 @@
attributes = <0x3>; /* read-write */
};
};
-
- device-regions {
- compatible = "arm,ffa-manifest-device-regions";
-
- test-reg {
- /* Dummy values */
- base-address = <0x00000000 0x25000000>;
- pages-count = <16>;
- attributes = <0x3>; /* read-write */
- reg = <0x10000008 0x00000001 1>;
- smmu-id = <1>;
- stream-ids = <0x0 0x1>;
- interrupts = <0x2 0x3>,
- <0x4 0x5>;
- };
- };
-
};
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus.dts b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
index 759adc4..94b8478 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
@@ -113,19 +113,5 @@
smmu-id = <0>;
stream-ids = <0x0 0x1>;
};
-
- test-reg {
- /* Dummy Values */
- base-address = <0x00000000 0x22000000>;
- pages-count = <64>;
- attributes = <0x3>; /* read-write */
- reg = <0x10000008 0x00000001 1>;
- smmu-id = <1>;
- stream-ids = <0x0 0x1>;
- interrupts = <0x2 0x3>,
- <0x4 0x5>;
- exclusive-access;
- };
};
-
};