From: Brian Hill <brian.hill@xilinx.com>
Date: Wed, 21 Jul 2010 22:04:13 +0000 (-0600)
Subject: Xilinx: ARM: Do not initialize DDR controller if it is already found to be out of... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe8867961081e6853103120824e260ab14d47926;p=thirdparty%2Fu-boot.git

Xilinx: ARM: Do not initialize DDR controller if it is already found to be out of reset.
---

diff --git a/board/xilinx/dfe/lowlevel_init.S b/board/xilinx/dfe/lowlevel_init.S
index 5ba0e19f3c9..d322561819b 100755
--- a/board/xilinx/dfe/lowlevel_init.S
+++ b/board/xilinx/dfe/lowlevel_init.S
@@ -11,6 +11,16 @@
 .globl lowlevel_init
 lowlevel_init:
 
+	# Do nothing if DDR already running
+	ldr r1, =(XPSS_DDR_CTRL_BASEADDR + 0)
+	ldr r2, [r1]
+	ldr r3, =0x201
+	cmp r2, r3
+	bne doit
+
+	mov pc, lr
+
+doit:
 	# unlock SLCR
 	ldr r1, =(XPSS_SYS_CTRL_BASEADDR + 8)
 	ldr r2, =0x767BDF0D