Skip to contentSkip to conversation

ARM: arm720t: Add missing CONFIG_SKIP_LOWLEVEL_INIT guard for cpu_init_crit

PATCH New Axel Lin 1 participant 2 messages May 21, 2013

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/2 ARM: arm720t: Add missing CONFIG_SKIP_LOWLEVEL_INIT guard for cpu_init_crit

cpu_init_crit() can be skipped, but the code is still enabled requiring a platform to supply lowlevel_init().

---
 arch/arm/cpu/arm720t/start.S | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/cpu/arm720t/start.S +2 -0
index 9facc7e..9f0e3f9 100644
@@ -244,6 +244,7 @@ c_runtime_cpu_setup:
  *************************************************************************
  */
 
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
 cpu_init_crit:
 
 #if !defined(CONFIG_TEGRA)
@@ -258,6 +259,7 @@ cpu_init_crit:
 #endif
 
 	mov	pc, lr
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 
 
 #ifndef CONFIG_SPL_BUILD
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH v2 2/2 tegra: Define CONFIG_SKIP_LOWLEVEL_INIT for SPL build

Then we can get rid of the #ifdef CONFIG_TEGRA guard in cpu_init_crit.

---
 arch/arm/cpu/arm720t/start.S        | 2 --
 include/configs/tegra-common-post.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/arm720t/start.S +0 -2
index 9f0e3f9..f425a55 100644
@@ -247,7 +247,6 @@ c_runtime_cpu_setup:
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 cpu_init_crit:
 
-#if !defined(CONFIG_TEGRA)
 	mov	ip, lr
 	/*
 	 * before relocating, we have to setup RAM timing
@@ -256,7 +255,6 @@ cpu_init_crit:
 	 */
 	bl	lowlevel_init
 	mov	lr, ip
-#endif
 
 	mov	pc, lr
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
include/configs/tegra-common-post.h +2 -0
index bf18699..6ed2fde 100644
@@ -157,6 +157,8 @@
 /* overrides for SPL build here */
 #ifdef CONFIG_SPL_BUILD
 
+#define CONFIG_SKIP_LOWLEVEL_INIT
+
 /* remove devicetree support */
 #ifdef CONFIG_OF_CONTROL
 #undef CONFIG_OF_CONTROL
Signature · 1 line
1.8.1.2