]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Nokia RX-51: Fix calculating return address in save_boot_params
authorPali Rohár <pali.rohar@gmail.com>
Tue, 9 Jun 2015 17:05:00 +0000 (19:05 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 12 Jun 2015 12:11:18 +0000 (08:11 -0400)
Commit e11c6c279d823dc0d2f470c5c2e3c0a9854a640f broke calculating lr register
in function save_boot_params() and caused U-Boot to crash at early boot time
on Nokia N900 board.

This patch fix calculating return address in lr register and make Nokia N900
board bootable again. Patch was tested in qemu and also on real N900 HW.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
board/nokia/rx51/lowlevel_init.S

index 9d4ea1b3f90e68d2670b914bd2f4e82180970f9a..420ad13a12cb09252fe08cb460987698840ecfe8 100644 (file)
@@ -105,10 +105,6 @@ fix_start:
        /* r6 - maximal u-boot size */
        ldr     r6, imagesize
 
-       /* fix return address */
-       subhi   lr, lr, r5
-       addlo   lr, lr, r5
-
        /* r1 - start of u-boot after */
        ldr     r1, startaddr