fvp: Align selected SPs between the build and configuration files
The TS secure partitions which are included in the build changes
depending on value of SPMC_TESTS, MEASURED_BOOT, TS_SMM_GATEWAY
variables. This patch synchronizes the selection behavior depending on
these variables in fvp-psa-sp.mk, bl2_sp_list.dtsi and
spmc_manifest.dts.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/fvp/spmc_manifest.dts b/fvp/spmc_manifest.dts
index bd959a6..027c109 100644
--- a/fvp/spmc_manifest.dts
+++ b/fvp/spmc_manifest.dts
@@ -64,12 +64,14 @@
};
#endif
+#if TS_SMM_GATEWAY
smm_gateway {
uuid = <0x33d532ed 0x0942e699 0x722dc09c 0xa798d9cd>;
load-address = <0x0 0x7d00000>;
};
+#endif /* TS_SMM_GATEWAY */
-#else /*BUILD_SPMC_TESTS*/
+#else /* SPMC_TESTS */
test_sp1 {
uuid = <0xc3db9e5c 0x67433a7b 0x197c839f 0x376ae81a>;
load-address = <0x0 0x7a00000>;
@@ -90,8 +92,8 @@
uuid = <0xed623742 0x6f407277 0x270cd899 0xf8bb0ada>;
load-address = <0x0 0x7a30000>;
};
-#endif
+#endif /* SPMC_TESTS */
};
-#endif
+#endif /* ARM_BL2_SP_LIST_DTS */
};