summaryrefslogtreecommitdiff
path: root/plat/arm
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-02-28 20:10:29 +0000
committerGitHub <noreply@github.com>2018-02-28 20:10:29 +0000
commitfdcc08af3a5cd83a63ac6dbc4a47b412a0b9f949 (patch)
tree902d1babf3650ab963184ab3d15666c407ab4904 /plat/arm
parent73a9605197ba04aaf02d436a2a4ad56e695b426c (diff)
parentfe7210cdca8e83b19a5e764d1c09622b639a133d (diff)
Merge pull request #1290 from jeenu-arm/dynamiq
DynamIQ on FVP
Diffstat (limited to 'plat/arm')
-rw-r--r--plat/arm/board/fvp/fvp_def.h5
-rw-r--r--plat/arm/board/fvp/platform.mk6
2 files changed, 10 insertions, 1 deletions
diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h
index a430bcac..5ac5d3cd 100644
--- a/plat/arm/board/fvp/fvp_def.h
+++ b/plat/arm/board/fvp/fvp_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -10,7 +10,10 @@
#ifndef FVP_CLUSTER_COUNT
#define FVP_CLUSTER_COUNT 2
#endif
+
+#ifndef FVP_MAX_CPUS_PER_CLUSTER
#define FVP_MAX_CPUS_PER_CLUSTER 4
+#endif
#ifndef FVP_MAX_PE_PER_CPU
# define FVP_MAX_PE_PER_CPU 1
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 8b913fb2..3dca4c2a 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -13,6 +13,9 @@ FVP_USE_SP804_TIMER := 0
# Default cluster count for FVP
FVP_CLUSTER_COUNT := 2
+# Default number of CPUs per cluster on FVP
+FVP_MAX_CPUS_PER_CLUSTER := 4
+
# Default number of threads per CPU on FVP
FVP_MAX_PE_PER_CPU := 1
@@ -27,6 +30,9 @@ $(eval $(call add_define,FVP_USE_GIC_DRIVER))
# Pass FVP_CLUSTER_COUNT to the build system.
$(eval $(call add_define,FVP_CLUSTER_COUNT))
+# Pass FVP_MAX_CPUS_PER_CLUSTER to the build system.
+$(eval $(call add_define,FVP_MAX_CPUS_PER_CLUSTER))
+
# Pass FVP_MAX_PE_PER_CPU to the build system.
$(eval $(call add_define,FVP_MAX_PE_PER_CPU))