projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
board: ls1012a: LS1012A-2G5RDB board support
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv8
/
transition.S
diff --git
a/arch/arm/cpu/armv8/transition.S
b/arch/arm/cpu/armv8/transition.S
index ca074653769eb2e634d74a70e93a3a76f93624c0..7aa6935318c6a95e8cf9cee28467af432c2fb6e6 100644
(file)
--- a/
arch/arm/cpu/armv8/transition.S
+++ b/
arch/arm/cpu/armv8/transition.S
@@
-10,6
+10,7
@@
#include <linux/linkage.h>
#include <asm/macro.h>
#include <linux/linkage.h>
#include <asm/macro.h>
+.pushsection .text.armv8_switch_to_el2, "ax"
ENTRY(armv8_switch_to_el2)
switch_el x6, 1f, 0f, 0f
0:
ENTRY(armv8_switch_to_el2)
switch_el x6, 1f, 0f, 0f
0:
@@
-30,7
+31,9
@@
ENTRY(armv8_switch_to_el2)
br x4
1: armv8_switch_to_el2_m x4, x5, x6
ENDPROC(armv8_switch_to_el2)
br x4
1: armv8_switch_to_el2_m x4, x5, x6
ENDPROC(armv8_switch_to_el2)
+.popsection
+.pushsection .text.armv8_switch_to_el1, "ax"
ENTRY(armv8_switch_to_el1)
switch_el x6, 0f, 1f, 0f
0:
ENTRY(armv8_switch_to_el1)
switch_el x6, 0f, 1f, 0f
0:
@@
-40,7
+43,10
@@
ENTRY(armv8_switch_to_el1)
br x4
1: armv8_switch_to_el1_m x4, x5, x6
ENDPROC(armv8_switch_to_el1)
br x4
1: armv8_switch_to_el1_m x4, x5, x6
ENDPROC(armv8_switch_to_el1)
+.popsection
+.pushsection .text.armv8_el2_to_aarch32, "ax"
WEAK(armv8_el2_to_aarch32)
ret
ENDPROC(armv8_el2_to_aarch32)
WEAK(armv8_el2_to_aarch32)
ret
ENDPROC(armv8_el2_to_aarch32)
+.popsection