summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/omap-common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-07 10:47:28 -0700
committerHans de Goede <hdegoede@redhat.com>2015-02-16 20:14:54 +0100
commite11c6c279d823dc0d2f470c5c2e3c0a9854a640f (patch)
tree31ae3d1bd015ec97d889ad6dc45baf5e1e127913 /arch/arm/cpu/armv7/omap-common
parentc924e2a8036f43f2f4a8e829ecfc8e9d6e8cce63 (diff)
downloadu-boot-imx-e11c6c279d823dc0d2f470c5c2e3c0a9854a640f.zip
u-boot-imx-e11c6c279d823dc0d2f470c5c2e3c0a9854a640f.tar.gz
u-boot-imx-e11c6c279d823dc0d2f470c5c2e3c0a9854a640f.tar.bz2
arm: Allow lr to be saved by board code
The link register value can be required on some boards (e.g. FEL mode on sunxi) so use a branch instruction to jump to save_boot_params() instead of a branch link. This requires a branch back to save_boot_params_ret so adjust the users to deal with this. For exynos just drop the function since it doesn't do anything. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Siarhei Siamashka <siarhei.siamashka@gmail.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
-rw-r--r--arch/arm/cpu/armv7/omap-common/lowlevel_init.S2
1 files changed, 1 insertions, 1 deletions
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
--- 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]
- bx lr
+ b save_boot_params_ret
ENDPROC(save_boot_params)
ENTRY(set_pl310_ctrl_reg)