Skip to contentSkip to conversation

ARM: fix address setup in start.S

PATCH New Darius Augulis 2 participants 2 messages Oct 25, 2010 – Oct 26, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: fix address setup in start.S

Fix address setup bug for ARM.
This bug stops u-boot booting if
CONFIG_SKIP_RELOCATE_UBOOT is defined.

---
 arch/arm/cpu/arm1136/start.S   |    6 ++++--
 arch/arm/cpu/arm926ejs/start.S |    6 ++++--
 arch/arm/cpu/armv7/start.S     |    6 ++++--
 arch/arm/cpu/pxa/start.S       |    6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)
arch/arm/cpu/arm1136/start.S +4 -2
index 29ed065..6a82310 100644
@@ -296,8 +296,10 @@ _nand_boot_ofs
 jump_2_ram:
 	ldr	r0, _board_init_r_ofs
 	adr	r1, _start
-	add	r0, r0, r1
-	add	lr, r0, r9
+	add	lr, r0, r1
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+	add	lr, lr, r9
+#endif
 	/* setup parameters for board_init_r */
 	mov	r0, r5		/* gd_t */
 	mov	r1, r7		/* dest_addr */
arch/arm/cpu/arm926ejs/start.S +4 -2
index 863de3b..e7e985a 100644
@@ -286,8 +286,10 @@ _nand_boot_ofs:
 #else
 	ldr	r0, _board_init_r_ofs
 	adr	r1, _start
-	add	r0, r0, r1
-	add	lr, r0, r9
+	add	lr, r0, r1
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+	add	lr, lr, r9
+#endif
 	/* setup parameters for board_init_r */
 	mov	r0, r5		/* gd_t */
 	mov	r1, r7		/* dest_addr */
arch/arm/cpu/armv7/start.S +4 -2
index 64c86e9..91e0523 100644
@@ -274,8 +274,10 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 jump_2_ram:
 	ldr	r0, _board_init_r_ofs
 	adr	r1, _start
-	add	r0, r0, r1
-	add	lr, r0, r9
+	add	lr, r0, r1
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+	add	lr, lr, r9
+#endif
 	/* setup parameters for board_init_r */
 	mov	r0, r5		/* gd_t */
 	mov	r1, r7		/* dest_addr */
arch/arm/cpu/pxa/start.S +4 -2
index 3c5bd84..73166c8 100644
@@ -330,8 +330,10 @@ _start_oneboot_ofs
 #else
 	ldr	r0, _board_init_r_ofs
 	adr	r1, _start
-	add	r0, r0, r1
-	add	lr, r0, r9
+	add	lr, r0, r1
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+	add	lr, lr, r9
+#endif
 	/* setup parameters for board_init_r */
 	mov	r0, r5		/* gd_t */
 	mov	r1, r7		/* dest_addr */
#1 lore raw

PATCH 1/1 ARM: fix address setup in start.S

Dear Darius Augulis,

Quoted 11 lines · In message <20101025104524.12379.22378.stgit@darius-desktop> you wrote:

Fix address setup bug for ARM.
This bug stops u-boot booting if
CONFIG_SKIP_RELOCATE_UBOOT is defined.

---
 arch/arm/cpu/arm1136/start.S   |    6 ++++--
 arch/arm/cpu/arm926ejs/start.S |    6 ++++--
 arch/arm/cpu/armv7/start.S     |    6 ++++--
 arch/arm/cpu/pxa/start.S       |    6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 8 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If a person (a) is poorly, (b) receives treatment  intended  to  make
him  better, and (c) gets better, then no power of reasoning known to
medical science can convince him  that  it  may  not  have  been  the
treatment that restored his health.
- Sir Peter Medawar, The Art of the Soluble