projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-imx-20190101' of git://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
macro.h
diff --git
a/arch/arm/include/asm/macro.h
b/arch/arm/include/asm/macro.h
index 0c8652a675fa98ba399a98cfc7489c992ae33ef4..bb33b4bc892bf2c13ad891fa43ab8e9e92b59599 100644
(file)
--- a/
arch/arm/include/asm/macro.h
+++ b/
arch/arm/include/asm/macro.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/asm-arm/macro.h
*
* Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
/*
* include/asm-arm/macro.h
*
* Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_ARM_MACRO_H__
*/
#ifndef __ASM_ARM_MACRO_H__
@@
-194,6
+193,10
@@
lr .req x30
SCR_EL3_SMD_DIS | SCR_EL3_RES1 |\
SCR_EL3_NS_EN)
#endif
SCR_EL3_SMD_DIS | SCR_EL3_RES1 |\
SCR_EL3_NS_EN)
#endif
+
+#ifdef CONFIG_ARMV8_EA_EL3_FIRST
+ orr \tmp, \tmp, #SCR_EL3_EA_EN
+#endif
msr scr_el3, \tmp
/* Return to the EL2_SP2 mode from EL3 */
msr scr_el3, \tmp
/* Return to the EL2_SP2 mode from EL3 */