fvp: Regroup and keep all the cluster arguments together

Keep all the arguments for a given cluster together.

Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
diff --git a/fvp.mk b/fvp.mk
index 6feeafc..1eb6a80 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -313,19 +313,19 @@
 	-C cache_state_modelled=0 \
 	-C pctl.startup=0.0.0.0 \
 	-C cluster0.NUM_CORES=4 \
-	-C cluster1.NUM_CORES=4 \
 	-C cluster0.cpu0.enable_crc32=1 \
 	-C cluster0.cpu1.enable_crc32=1 \
 	-C cluster0.cpu2.enable_crc32=1 \
 	-C cluster0.cpu3.enable_crc32=1 \
-	-C cluster1.cpu0.enable_crc32=1 \
-	-C cluster1.cpu1.enable_crc32=1 \
-	-C cluster1.cpu2.enable_crc32=1 \
-	-C cluster1.cpu3.enable_crc32=1 \
 	-C cluster0.cpu0.semihosting-cwd="$(BINARIES_PATH)" \
 	-C cluster0.cpu1.semihosting-cwd="$(BINARIES_PATH)" \
 	-C cluster0.cpu2.semihosting-cwd="$(BINARIES_PATH)" \
 	-C cluster0.cpu3.semihosting-cwd="$(BINARIES_PATH)" \
+	-C cluster1.NUM_CORES=4 \
+	-C cluster1.cpu0.enable_crc32=1 \
+	-C cluster1.cpu1.enable_crc32=1 \
+	-C cluster1.cpu2.enable_crc32=1 \
+	-C cluster1.cpu3.enable_crc32=1 \
 	-C cluster1.cpu0.semihosting-cwd="$(BINARIES_PATH)" \
 	-C cluster1.cpu1.semihosting-cwd="$(BINARIES_PATH)" \
 	-C cluster1.cpu2.semihosting-cwd="$(BINARIES_PATH)" \