summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-04-03 15:46:10 +0200
committerWolfgang Denk <wd@nyx.denx.de>2006-04-03 15:46:10 +0200
commitdb28ddb4da7387f4658ae5d032263258e53a1f37 (patch)
tree284be8628bad118b42cc7ef5f52258321ba97fc5
parent534ff676a9c2ffd460e096754894e78551e4ed1e (diff)
downloadu-boot-imx-db28ddb4da7387f4658ae5d032263258e53a1f37.zip
u-boot-imx-db28ddb4da7387f4658ae5d032263258e53a1f37.tar.gz
u-boot-imx-db28ddb4da7387f4658ae5d032263258e53a1f37.tar.bz2
Fix CONFIG_SKIP_LOWLEVEL_INIT dependency in cpu/arm920t/start.S
Patch by Peter Menzebach, 13 Oct 2005 [DNX#2006040142000473]
-rw-r--r--CHANGELOG3
-rw-r--r--cpu/arm920t/start.S3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fdb6aae..271f0fb 100644
--- 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 4603cf5..346f0d0 100644
--- 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 */
/*
*************************************************************************