aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorDarius Augulis <augulis.darius@gmail.com>2010-10-25 13:45:35 +0300
committerWolfgang Denk <wd@denx.de>2010-10-26 21:11:58 +0200
commit123fb7deb238cf9d03e82f98962ed7f03d09703a (patch)
treebd8625d39bc4773de1e59012293971e88b5ecb98 /arch/arm/cpu/pxa
parent25ddd1fb0a2281b182529afbc8fda5de2dc16d96 (diff)
downloadu-boot-linaro-stable-123fb7deb238cf9d03e82f98962ed7f03d09703a.tar.gz
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>
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/start.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index b8065b70d..bf8510eb7 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -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 */