projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
omap-common
/
lowlevel_init.S
diff --git
a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index
86c0e42
..
e19c7ae
100644
(file)
--- a/
arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/
arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@
-19,7
+19,7
@@
ENTRY(save_boot_params)
ldr r1, =OMAP_SRAM_SCRATCH_BOOT_PARAMS
str r0, [r1]
- b
x lr
+ b
save_boot_params_ret
ENDPROC(save_boot_params)
ENTRY(set_pl310_ctrl_reg)