diff options
| author | danh-arm <dan.handley@arm.com> | 2016-02-19 18:21:34 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-02-19 18:21:34 +0000 |
| commit | f62d89ed866d26beb96a6ddff1cbd80e9f51760c (patch) | |
| tree | d82876a622a662bf6b36feb0066cb4e71e5b8381 /include/plat | |
| parent | 85df7e44ce3974e2c78d99e6ea31f047de6de445 (diff) | |
| parent | 0108047ae425faa91ddf782f264d7ed67d3351d8 (diff) | |
Merge pull request #531 from soby-mathew/sm/multicluster_fvp
Allow multi cluster topology definitions for ARM platforms
Diffstat (limited to 'include/plat')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 5 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 8d753637..dab75450 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -44,7 +44,6 @@ /* Special value used to verify platform parameters from BL2 to BL31 */ #define ARM_BL31_PLAT_PARAM_VAL 0x0f1e2d3c4b5a6978ULL -#define ARM_CLUSTER_COUNT 2 #define ARM_SYSTEM_COUNT 1 #define ARM_CACHE_WRITEBACK_SHIFT 6 @@ -214,10 +213,6 @@ */ #define PLAT_MAX_OFF_STATE ARM_LOCAL_STATE_OFF - -#define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER0_CORE_COUNT + \ - PLAT_ARM_CLUSTER1_CORE_COUNT) - /* * Some data must be aligned on the biggest cache line size in the platform. * This is known only to the platform as it might have a combination of diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 8d7e83b5..e9eebaa0 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -179,6 +179,7 @@ int arm_io_is_toc_valid(void); /* * Mandatory functions required in ARM standard platforms */ +unsigned int plat_arm_get_cluster_core_count(u_register_t mpidr); void plat_arm_gic_driver_init(void); void plat_arm_gic_init(void); void plat_arm_gic_cpuif_enable(void); |