Fix CONFIG_SKIP_LOWLEVEL_INIT dependency in cpu/arm920t/start.S

Patch by Peter Menzebach, 13 Oct 2005 [DNX#2006040142000473]

diff --git a/CHANGELOG b/CHANGELOG
index fdb6aae5e5f478405be348692e9ef004562f42c5..271f0fb74197ff2db654cfc907b2adcff0f9eb7e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix CONFIG_SKIP_LOWLEVEL_INIT dependency in cpu/arm920t/start.S
+  Patch by Peter Menzebach, 13 Oct 2005 [DNX#2006040142000473]
+
 * Add support for ymodem protocol download
   Patch by Stefano Babic, 29 Mar 2006
 

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 4603cf573376fdfaa5b7b88933c6b1190591976a..346f0d09ea77a18b2c9a7b2a3d08a078a9aa4741 100644 (file)
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -237,6 +237,7 @@ _start_armboot:     .word start_armboot
  */
 
 
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
 cpu_init_crit:
        /*
         * flush v4 I/D caches
@@ -264,7 +265,7 @@ cpu_init_crit:
        bl      lowlevel_init
        mov     lr, ip
        mov     pc, lr
-
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 
 /*
  *************************************************************************