[U-Boot] [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().
Signed-off-by: Axel Lin axel.lin@ingics.com Tested-by: Stephen Warren swarren@nvidia.com --- arch/arm/cpu/arm720t/start.S | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index 9facc7e..9f0e3f9 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -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
Then we can get rid of the #ifdef CONFIG_TEGRA guard in cpu_init_crit.
Signed-off-by: Axel Lin axel.lin@ingics.com Tested-by: Stephen Warren swarren@nvidia.com --- arch/arm/cpu/arm720t/start.S | 2 -- include/configs/tegra-common-post.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index 9f0e3f9..f425a55 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -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 */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index bf18699..6ed2fde 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -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
participants (1)
-
Axel Lin