]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
tegra: Define CONFIG_SKIP_LOWLEVEL_INIT for SPL build
authorAxel Lin <axel.lin@ingics.com>
Tue, 21 May 2013 13:45:18 +0000 (13:45 +0000)
committerTom Warren <twarren@nvidia.com>
Tue, 28 May 2013 19:58:44 +0000 (12:58 -0700)
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>
arch/arm/cpu/arm720t/start.S
include/configs/tegra-common-post.h

index 9f0e3f961a3dc4283a02535996918942e60c4884..f425a55a3b84e577ee55b961f8f0ebdff63b2600 100644 (file)
@@ -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 */
index bf186995ed4417b8f0c186e64645845ae23f8cca..6ed2fde3f365a830f04d0cd1b7201e9825a67c73 100644 (file)
 /* 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