diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-03-24 10:12:42 +0000 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2016-05-25 10:25:16 +0100 |
| commit | 7123787616e21871319909508e80594c7f24f6b8 (patch) | |
| tree | 003037879d9305b08452f220af2a286485f91175 /plat/arm/board/fvp/fvp_common.c | |
| parent | 6331a31a66cdcf53421d3dccd3067f072c6da175 (diff) | |
| download | arm-trusted-firmware-7123787616e21871319909508e80594c7f24f6b8.tar.gz | |
Add CCN support to FVP platform port
This patch adds support to select CCN driver for FVP during build.
A new build option `FVP_INTERCONNECT_DRIVER` is added to allow
selection between the CCI and CCN driver. Currently only the CCN-502
variant is supported on FVP.
The common ARM CCN platform helper file now verifies the cluster
count declared by platform is equal to the number of root node
masters exported by the ARM Standard platform.
Change-Id: I71d7b4785f8925ed499c153b2e9b9925fcefd57a
Diffstat (limited to 'plat/arm/board/fvp/fvp_common.c')
| -rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index 78782d43..eb67dab2 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -30,6 +30,7 @@ #include <arm_config.h> #include <arm_def.h> +#include <ccn.h> #include <debug.h> #include <gicv2.h> #include <mmio.h> @@ -213,8 +214,16 @@ void fvp_config_setup(void) void fvp_interconnect_init(void) { - if (arm_config.flags & ARM_CONFIG_HAS_INTERCONNECT) + if (arm_config.flags & ARM_CONFIG_HAS_INTERCONNECT) { +#if FVP_INTERCONNECT_DRIVER == FVP_CCN + if (ccn_get_part0_id(PLAT_ARM_CCN_BASE) != CCN_502_PART0_ID) { + ERROR("Unrecognized CCN variant detected. Only CCN-502" + " is supported"); + panic(); + } +#endif plat_arm_interconnect_init(); + } } void fvp_interconnect_enable(void) |