From c478ff5d1ecd4fb11672bc6060f8ad0257a8fa4b Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@linaro.org>
Date: Mon, 20 Jan 2014 15:45:26 +0000
Subject: [PATCH] juno: Port CCI
Signed-off-by: Jon Medhurst <tixy@linaro.org>
---
plat/juno/bl1_plat_setup.c | 7 +------
plat/juno/platform.h | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/plat/juno/bl1_plat_setup.c b/plat/juno/bl1_plat_setup.c
index 96dc85410..995cd7fc6 100644
--- a/plat/juno/bl1_plat_setup.c
+++ b/plat/juno/bl1_plat_setup.c
@@ -123,17 +123,12 @@ void bl1_platform_setup(void)
******************************************************************************/
void bl1_plat_arch_setup(void)
{
- unsigned long cci_setup;
-
/*
* Enable CCI-400 for this cluster. No need
* for locks as no other cpu is active at the
* moment
*/
- cci_setup = platform_get_cfgvar(CONFIG_HAS_CCI);
- if (cci_setup) {
- cci_enable_coherency(read_mpidr());
- }
+ cci_enable_coherency(read_mpidr());
configure_mmu(&bl1_tzram_layout,
TZROM_BASE,
diff --git a/plat/juno/platform.h b/plat/juno/platform.h
index 2728988bf..4a9151961 100644
--- a/plat/juno/platform.h
+++ b/plat/juno/platform.h
@@ -160,8 +160,8 @@
* CCI-400 related constants
******************************************************************************/
#define CCI400_BASE 0x2c090000
-#define CCI400_SL_IFACE_CLUSTER0 3
-#define CCI400_SL_IFACE_CLUSTER1 4
+#define CCI400_SL_IFACE_CLUSTER0 4
+#define CCI400_SL_IFACE_CLUSTER1 3
#define CCI400_SL_IFACE_INDEX(mpidr) (mpidr & MPIDR_CLUSTER_MASK ? \
CCI400_SL_IFACE_CLUSTER1 : \
CCI400_SL_IFACE_CLUSTER0)
--
GitLab