summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-05-21 13:45:18 +0000
committerTom Warren <twarren@nvidia.com>2013-05-28 12:58:44 -0700
commit60985bba58e7695dac1fddae8cdbb62d8cfd1254 (patch)
treec4dffea403d9555cc675348aba08266cac8d61d5
parent578e63782b87ed0673b7d5088d793db1c46017bb (diff)
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 <axel.lin@ingics.com> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--arch/arm/cpu/arm720t/start.S2
-rw-r--r--include/configs/tegra-common-post.h2
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