mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-21 02:33:07 +00:00
c21f3d4571
Commit 88998f7775 ("arm: arm926ej-s: Add sunxi code") introduced
the ARM926 version of the code to save and restore some FEL state, to
be able to return to the BROM FEL code after the SPL has run.
However during review a change was made, that happened to mess up the
register restore part, so SCTLR and CPSR ended up with the wrong values,
breaking return to FEL.
Use the same offset that we actually save those registers to, to make
FEL booting actually work on the Lichee Pi Nano.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
33 lines
681 B
ArmAsm
33 lines
681 B
ArmAsm
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Utility functions for FEL mode.
|
|
*
|
|
* Copyright (c) 2015 Google, Inc
|
|
*/
|
|
|
|
#include <asm-offsets.h>
|
|
#include <config.h>
|
|
#include <asm/system.h>
|
|
#include <linux/linkage.h>
|
|
|
|
ENTRY(save_boot_params)
|
|
ldr r0, =fel_stash
|
|
str sp, [r0, #0]
|
|
str lr, [r0, #4]
|
|
mrs lr, cpsr @ Read CPSR
|
|
str lr, [r0, #8]
|
|
mrc p15, 0, lr, c1, c0, 0 @ Read CP15 SCTLR Register
|
|
str lr, [r0, #12]
|
|
b save_boot_params_ret
|
|
ENDPROC(save_boot_params)
|
|
|
|
ENTRY(return_to_fel)
|
|
mov sp, r0
|
|
mov lr, r1
|
|
ldr r0, =fel_stash
|
|
ldr r1, [r0, #12]
|
|
mcr p15, 0, r1, c1, c0, 0 @ Write CP15 SCTLR register
|
|
ldr r1, [r0, #8]
|
|
msr cpsr, r1 @ Write CPSR
|
|
bx lr
|
|
ENDPROC(return_to_fel)
|