diff mbox

[U-Boot] EXYNOS: fix regression for Origen4210

Message ID 1434448293-19360-1-git-send-email-thomas.ab@samsung.com
State Superseded
Delegated to: Minkyu Kang
Headers show

Commit Message

Thomas Abraham June 16, 2015, 9:51 a.m. UTC 
The do_lowlevel_init() function includes certian CA15 specific L2 cache
configuration which is only applicable on Exynos5420 and members of its
family. Fix the regression on Origen4210 by skipping the Exynos5420
specific portions of the code.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
---
 arch/arm/cpu/armv7/exynos/common_setup.h  |    2 +-
 arch/arm/cpu/armv7/exynos/lowlevel_init.c |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/exynos/common_setup.h b/arch/arm/cpu/armv7/exynos/common_setup.h
index 5235abb..67aac2d 100644
--- a/arch/arm/cpu/armv7/exynos/common_setup.h
+++ b/arch/arm/cpu/armv7/exynos/common_setup.h
@@ -60,7 +60,7 @@  enum l2_cache_params {
 };
 
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
+#if !defined(CONFIG_SYS_L2CACHE_OFF) && defined(CONFIG_EXYNOS5420)
 /*
  * Configure L2CTLR to get timings that keep us from hanging/crashing.
  *
diff --git a/arch/arm/cpu/armv7/exynos/lowlevel_init.c b/arch/arm/cpu/armv7/exynos/lowlevel_init.c
index 120aaf8..1c125f6 100644
--- a/arch/arm/cpu/armv7/exynos/lowlevel_init.c
+++ b/arch/arm/cpu/armv7/exynos/lowlevel_init.c
@@ -174,7 +174,7 @@  int do_lowlevel_init(void)
 
 	arch_cpu_init();
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
+#if !defined(CONFIG_SYS_L2CACHE_OFF) && defined(CONFIG_EXYNOS5420)
 	/*
 	 * Init L2 cache parameters here for use by boot and resume
 	 *
@@ -187,9 +187,7 @@  int do_lowlevel_init(void)
 	configure_l2_actlr();
 	dsb();
 	isb();
-#endif
 
-#ifdef CONFIG_EXYNOS5420
 	relocate_wait_code();
 
 	/* Reconfigure secondary cores */