From 60985bba58e7695dac1fddae8cdbb62d8cfd1254 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 21 May 2013 13:45:18 +0000 Subject: tegra: Define CONFIG_SKIP_LOWLEVEL_INIT for SPL build Then we can get rid of the #ifdef CONFIG_TEGRA guard in cpu_init_crit. Signed-off-by: Axel Lin Tested-by: Stephen Warren Signed-off-by: Tom Warren --- 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 9f0e3f961a..f425a55a3b 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 bf186995ed..6ed2fde3f3 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 -- cgit v1.2.3