Patchwork [U-Boot] arm1136 relocation: Fix calculation of board_init_r

login
register
mail settings
Submitter Fabio Estevam
Date Feb. 18, 2011, 12:27 a.m.
Message ID <1297988861-17711-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/83519/
State Accepted
Commit 0952ea16ad29c3975f6cf79435ccab4b588d4a86
Delegated to: Albert ARIBAUD
Headers show

Comments

Fabio Estevam - Feb. 18, 2011, 12:27 a.m.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/cpu/arm1136/start.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Albert ARIBAUD - Feb. 18, 2011, 7:55 a.m.
Le 18/02/2011 01:27, Fabio Estevam a écrit :
> Signed-off-by: Fabio Estevam<fabio.estevam@freescale.com>
> ---
>   arch/arm/cpu/arm1136/start.S |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
> index bab2868..a05d36d 100644
> --- a/arch/arm/cpu/arm1136/start.S
> +++ b/arch/arm/cpu/arm1136/start.S
> @@ -266,7 +266,7 @@ _nand_boot_ofs:
>   #else
>   jump_2_ram:
>   	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 */

Applied, thanks.

Amicalement,

Patch

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index bab2868..a05d36d 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -266,7 +266,7 @@  _nand_boot_ofs:
 #else
 jump_2_ram:
 	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 */