diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-08-04 16:11:15 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-08-14 10:49:20 +0100 |
| commit | cae3ef992e24b9ceb2ba1cd7d2ef0c6faaf29e0a (patch) | |
| tree | 453461858d984fca597da46d983a33e9fda89adf /plat/fvp/bl31_fvp_setup.c | |
| parent | f0e240d7f59cbf1cb99fc358ddec967cad8bf3df (diff) | |
Remove platform dependency in CCI-400 driver
* Create cci_init() function in CCI-400 driver to allow platform
to provide arguments needed by the driver (i.e. base address
and cluster indices for the ACE slave interfaces).
* Rename cci_(en|dis)able_coherency to
cci_(en|dis)able_cluster_coherency to make it clear that
the driver only enables/disables the coherency of CPU
clusters and not other devices connected to the CCI-400.
* Update FVP port to use new cci_init() function and remove
unnecessary CCI defintions from platform_def.h. Also rename
fvp_cci_setup() to fvp_cci_enable() to more clearly
differentiate between CCI initialization and enabling.
THIS CHANGE REQUIRES PLATFORM PORTS THAT USE THE CCI-400 DRIVER
TO BE UPDATED
Fixes ARM-software/tf-issues#168
Change-Id: I1946a51409b91217b92285b6375082619f607fec
Diffstat (limited to 'plat/fvp/bl31_fvp_setup.c')
| -rw-r--r-- | plat/fvp/bl31_fvp_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/fvp/bl31_fvp_setup.c b/plat/fvp/bl31_fvp_setup.c index 0693a12a..69efc9cf 100644 --- a/plat/fvp/bl31_fvp_setup.c +++ b/plat/fvp/bl31_fvp_setup.c @@ -230,9 +230,9 @@ void bl31_platform_setup(void) ******************************************************************************/ void bl31_plat_arch_setup(void) { + fvp_cci_init(); #if RESET_TO_BL31 - fvp_cci_setup(); - + fvp_cci_enable(); #endif fvp_configure_mmu_el3(BL31_RO_BASE, (BL31_COHERENT_RAM_LIMIT - BL31_RO_BASE), |