juno: Port CCI

Signed-off-by: Jon Medhurst <tixy@linaro.org>
This commit is contained in:
Jon Medhurst 2014-01-20 15:45:26 +00:00 committed by Sandrine Bailleux
parent 4c47d98a44
commit c478ff5d1e
2 changed files with 3 additions and 8 deletions

View File

@ -123,17 +123,12 @@ void bl1_platform_setup(void)
******************************************************************************/ ******************************************************************************/
void bl1_plat_arch_setup(void) void bl1_plat_arch_setup(void)
{ {
unsigned long cci_setup;
/* /*
* Enable CCI-400 for this cluster. No need * Enable CCI-400 for this cluster. No need
* for locks as no other cpu is active at the * for locks as no other cpu is active at the
* moment * moment
*/ */
cci_setup = platform_get_cfgvar(CONFIG_HAS_CCI); cci_enable_coherency(read_mpidr());
if (cci_setup) {
cci_enable_coherency(read_mpidr());
}
configure_mmu(&bl1_tzram_layout, configure_mmu(&bl1_tzram_layout,
TZROM_BASE, TZROM_BASE,

View File

@ -160,8 +160,8 @@
* CCI-400 related constants * CCI-400 related constants
******************************************************************************/ ******************************************************************************/
#define CCI400_BASE 0x2c090000 #define CCI400_BASE 0x2c090000
#define CCI400_SL_IFACE_CLUSTER0 3 #define CCI400_SL_IFACE_CLUSTER0 4
#define CCI400_SL_IFACE_CLUSTER1 4 #define CCI400_SL_IFACE_CLUSTER1 3
#define CCI400_SL_IFACE_INDEX(mpidr) (mpidr & MPIDR_CLUSTER_MASK ? \ #define CCI400_SL_IFACE_INDEX(mpidr) (mpidr & MPIDR_CLUSTER_MASK ? \
CCI400_SL_IFACE_CLUSTER1 : \ CCI400_SL_IFACE_CLUSTER1 : \
CCI400_SL_IFACE_CLUSTER0) CCI400_SL_IFACE_CLUSTER0)