summaryrefslogtreecommitdiff
path: root/cpu/arm946es
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-15 23:45:20 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:48 +0200
commit8fc3bb4b0603516ad641e2de252a400b85fd869b (patch)
tree67b1974fe65ed42862111b903390edc81f1d468f /cpu/arm946es
parentc20e28f49aaf38c7dede46d8f8fe8234fe90822c (diff)
downloadu-boot-imx-8fc3bb4b0603516ad641e2de252a400b85fd869b.zip
u-boot-imx-8fc3bb4b0603516ad641e2de252a400b85fd869b.tar.gz
u-boot-imx-8fc3bb4b0603516ad641e2de252a400b85fd869b.tar.bz2
arm: cleanup remaining CONFIG_INIT_CRITICAL
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'cpu/arm946es')
-rw-r--r--cpu/arm946es/start.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/arm946es/start.S b/cpu/arm946es/start.S
index 9375c76..627e3cb 100644
--- a/cpu/arm946es/start.S
+++ b/cpu/arm946es/start.S
@@ -133,7 +133,7 @@ reset:
* we do sys-critical inits only at reboot,
* not when booting from ram!
*/
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
bl cpu_init_crit
#endif
@@ -192,6 +192,7 @@ _start_armboot:
*/
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
cpu_init_crit:
/*
* flush v4 I/D caches
@@ -217,6 +218,7 @@ cpu_init_crit:
bl lowlevel_init /* go setup memory */
mov lr, ip /* restore link */
mov pc, lr /* back to my caller */
+#endif
/*
*************************************************************************
*