From db28ddb4da7387f4658ae5d032263258e53a1f37 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@nyx.denx.de>
Date: Mon, 3 Apr 2006 15:46:10 +0200
Subject: [PATCH] Fix CONFIG_SKIP_LOWLEVEL_INIT dependency in
 cpu/arm920t/start.S Patch by Peter Menzebach, 13 Oct 2005
 [DNX#2006040142000473]

---
 CHANGELOG           | 3 +++
 cpu/arm920t/start.S | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fdb6aae5e5..271f0fb741 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 4603cf5733..346f0d09ea 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 */
 
 /*
  *************************************************************************
-- 
2.39.5