ppc4xx: Big cleanup of PPC4xx defines

[karo-tx-uboot.git] / cpu / arm946es / start.S

diff --git a/cpu/arm946es/start.S b/cpu/arm946es/start.S
index 7972b00765c3e6d31d4582a089ddaf0aee0fe019..627e3cb94db5beb2ea736bf0cc3e714803857961 100644 (file)
--- a/cpu/arm946es/start.S
+++ b/cpu/arm946es/start.S
@@ -7,7 +7,7 @@
  *
  *  Copyright (c) 2001 Marius Gröger <mag@sysgo.de>
  *  Copyright (c) 2002 Alex Züpke <azu@sysgo.de>
- *  Copyright (c) 2002 Gary Jennejohn <gj@denx.de>
+ *  Copyright (c) 2002 Gary Jennejohn <garyj@denx.de>
  *  Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
  *  Copyright (c) 2003 Kshitij <kshitij@ti.com>
  *
@@ -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
 /*
  *************************************************************************
  *