diff options
| author | Tom Rini <trini@ti.com> | 2015-02-16 19:55:50 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-17 11:27:44 (GMT) |
| commit | a851604ca36493e8319a7d3a17594b7224d546fe (patch) | |
| tree | dff68fbdd1b098e334d0da031de250dc8852c3b9 /arch/arm/cpu/armv7/omap-common | |
| parent | 0ce3f1f90ae6168805f20e473a9ed7fab5fb13a8 (diff) | |
| parent | 840fe95c3bcff7692c51b90ebc0d350792597ff0 (diff) | |
| download | u-boot-a851604ca36493e8319a7d3a17594b7224d546fe.tar.xz | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 2 |
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) |