diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
| commit | f46c25583a73042edf432b209ee4b93bc3f7e762 (patch) | |
| tree | a7cbd8afde1b0cbf86a9c8150cbd737df3ee82c9 /arch/arm/mach-mvebu/lowlevel_spl.S | |
| parent | db18f548cb7b5ff99223b66eac1966eb45230817 (diff) | |
| parent | f822d8578ba395d9af1cc315a2fb87b1eed3d355 (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Conflicts:
arch/arm/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-mvebu/lowlevel_spl.S')
| -rw-r--r-- | arch/arm/mach-mvebu/lowlevel_spl.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mvebu/lowlevel_spl.S b/arch/arm/mach-mvebu/lowlevel_spl.S index 2e2181ecea..49e0b906d5 100644 --- a/arch/arm/mach-mvebu/lowlevel_spl.S +++ b/arch/arm/mach-mvebu/lowlevel_spl.S @@ -5,7 +5,6 @@ #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 @@ -19,11 +18,6 @@ ENTRY(return_to_bootrom) 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 |