From: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Date: Thu, 3 Feb 2011 10:52:29 +0000 (+0000)
Subject: arm relocation: Fix calculation of board_init_r
X-Git-Tag: v2011.03-rc2~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6087f1a90cb2f275752496229b96f0e00aa0a7cd;p=oweals%2Fu-boot.git

arm relocation: Fix calculation of board_init_r

Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
---

diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index eb93ac9db7..f4c177e523 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -281,7 +281,7 @@ _nand_boot_ofs:
 	.word nand_boot
 #else
 	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
+	ldr	r1, _TEXT_BASE
 	add	lr, r0, r1
 	add	lr, lr, r9
 	/* setup parameters for board_init_r */