Browse Source

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.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
master
Darius Augulis 10 years ago
committed by Wolfgang Denk
parent
commit
123fb7deb2
4 changed files with 16 additions and 8 deletions
  1. +4
    -2
      arch/arm/cpu/arm1136/start.S
  2. +4
    -2
      arch/arm/cpu/arm926ejs/start.S
  3. +4
    -2
      arch/arm/cpu/armv7/start.S
  4. +4
    -2
      arch/arm/cpu/pxa/start.S

+ 4
- 2
arch/arm/cpu/arm1136/start.S View File

@ -297,8 +297,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 */


+ 4
- 2
arch/arm/cpu/arm926ejs/start.S View File

@ -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 */


+ 4
- 2
arch/arm/cpu/armv7/start.S View File

@ -275,8 +275,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 */


+ 4
- 2
arch/arm/cpu/pxa/start.S View File

@ -331,8 +331,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 */


Loading…
Cancel
Save