build(fvp): reduce the number of cpu libraries included by default

The fvp build includes a very large number of cpus so that it can run on
a wide range of models. One config (HW_ASSISTED_COHERENCY=1
CTX_INCLUDE_AARCH32_REGS=0) includes an unusually large number of cpus.
Well, the list is quite arbitrary and incomplete. As we're currently out
of BL31 space on the fvp, remove all that are not routinely run in the
CI to buy us some time.

Also use the opportunity to reorder the list into something searchable.

Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I8c6cad41327451edf0d3a0e92c43d6c72c254aac

diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 214064bf146a7ae54254700c264649403366e43f..a893155227c991dfdf216853fb2faa66a2719d86 100644 (file)
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -186,31 +186,21 @@ else
 # Cores used with DSU only
        ifeq (${CTX_INCLUDE_AARCH32_REGS}, 0)
        # AArch64-only cores
-               FVP_CPU_LIBS    +=      lib/cpus/aarch64/cortex_a76.S           \
+       # TODO: add all cores to the appropriate lists
+               FVP_CPU_LIBS    +=      lib/cpus/aarch64/cortex_a65.S           \
+                                       lib/cpus/aarch64/cortex_a65ae.S         \
+                                       lib/cpus/aarch64/cortex_a76.S           \
                                        lib/cpus/aarch64/cortex_a76ae.S         \
                                        lib/cpus/aarch64/cortex_a77.S           \
                                        lib/cpus/aarch64/cortex_a78.S           \
+                                       lib/cpus/aarch64/cortex_a78c.S          \
+                                       lib/cpus/aarch64/cortex_a710.S          \
                                        lib/cpus/aarch64/neoverse_n_common.S    \
                                        lib/cpus/aarch64/neoverse_n1.S          \
                                        lib/cpus/aarch64/neoverse_n2.S          \
-                                       lib/cpus/aarch64/neoverse_e1.S          \
                                        lib/cpus/aarch64/neoverse_v1.S          \
-                                       lib/cpus/aarch64/neoverse_v2.S  \
-                                       lib/cpus/aarch64/cortex_a78_ae.S        \
-                                       lib/cpus/aarch64/cortex_a510.S          \
-                                       lib/cpus/aarch64/cortex_a710.S          \
-                                       lib/cpus/aarch64/cortex_a715.S          \
-                                       lib/cpus/aarch64/cortex_x3.S            \
-                                       lib/cpus/aarch64/cortex_a65.S           \
-                                       lib/cpus/aarch64/cortex_a65ae.S         \
-                                       lib/cpus/aarch64/cortex_a78c.S          \
-                                       lib/cpus/aarch64/cortex_hayes.S         \
-                                       lib/cpus/aarch64/cortex_hunter.S        \
-                                       lib/cpus/aarch64/cortex_hunter_elp_arm.S \
-                                       lib/cpus/aarch64/cortex_x2.S            \
-                                       lib/cpus/aarch64/neoverse_poseidon.S    \
-                                       lib/cpus/aarch64/cortex_chaberton.S     \
-                                       lib/cpus/aarch64/cortex_blackhawk.S
+                                       lib/cpus/aarch64/neoverse_e1.S          \
+                                       lib/cpus/aarch64/cortex_x2.S
        endif
        # AArch64/AArch32 cores
        FVP_CPU_LIBS    +=      lib/cpus/aarch64/cortex_a55.S           \