diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-20 21:59:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-20 21:59:40 -0400 |
| commit | e8d124fae0f3dff87348c989aa65ecf9b6eadc14 (patch) | |
| tree | ff4f4709e54cde4d97349463c335d00f2d631e42 /arch/arm/mach-mvebu/lowlevel_spl.S | |
| parent | fd8133b725198978865ead730ff20d3991e05f20 (diff) | |
| parent | 5b37212a3d78f546b5ef3f97a75155b3a0fd88cb (diff) | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm/mach-mvebu/lowlevel_spl.S')
| -rw-r--r-- | arch/arm/mach-mvebu/lowlevel_spl.S | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/lowlevel_spl.S b/arch/arm/mach-mvebu/lowlevel_spl.S index 69da7fe7af..2e2181ecea 100644 --- a/arch/arm/mach-mvebu/lowlevel_spl.S +++ b/arch/arm/mach-mvebu/lowlevel_spl.S @@ -5,10 +5,26 @@ #include <config.h> #include <linux/linkage.h> +#ifdef CONFIG_MVEBU_BOOTROM_UARTBOOT ENTRY(save_boot_params) + stmfd sp!, {r0 - r12, lr} /* @ save registers on stack */ + ldr r12, =CONFIG_SPL_BOOTROM_SAVE + str sp, [r12] b save_boot_params_ret ENDPROC(save_boot_params) +ENTRY(return_to_bootrom) + ldr r12, =CONFIG_SPL_BOOTROM_SAVE + ldr sp, [r12] + mov r0, #0x0 /* @ return value: 0x0 NO_ERR */ + ldmfd sp!, {r0 - r12, pc} /* @ restore regs and return */ +ENDPROC(return_to_bootrom) +#else +ENTRY(save_boot_params) + b save_boot_params_ret +ENDPROC(save_boot_params) +#endif + /* * cache_inv - invalidate Cache line * r0 - dest |