commit 2d592b71cccfad9c504550ce368c94808a6c708e
author John Tsichritzis <john.tsichritzis@arm.com> Thu Jul 11 15:39:02 2019 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Thu Jul 11 15:39:02 2019 +0000
tree 45c9bf9c078fbb774b9536f834dfb53049549eb9
parent 9479e89ccd3fac549658804a86cf1dafd2fda1b0
parent c31ab38eb8b5ffcd144ab1aa4dd0071659435bf0

Merge "Aarch64: Fix SCTLR bit definitions" into integration

include/arch/aarch64/arch.h

diff --git a/include/arch/aarch64/arch.h b/include/arch/aarch64/arch.h
index 502b868..913b62c 100644
--- a/include/arch/aarch64/arch.h
+++ b/include/arch/aarch64/arch.h
@@ -250,7 +250,7 @@
 #define SCTLR_SED_BIT		(ULL(1) << 8)
 #define SCTLR_UMA_BIT		(ULL(1) << 9)
 #define SCTLR_I_BIT		(ULL(1) << 12)
-#define SCTLR_V_BIT		(ULL(1) << 13)
+#define SCTLR_EnDB_BIT		(ULL(1) << 13)
 #define SCTLR_DZE_BIT		(ULL(1) << 14)
 #define SCTLR_UCT_BIT		(ULL(1) << 15)
 #define SCTLR_NTWI_BIT		(ULL(1) << 16)
@@ -261,6 +261,8 @@
 #define SCTLR_E0E_BIT		(ULL(1) << 24)
 #define SCTLR_EE_BIT		(ULL(1) << 25)
 #define SCTLR_UCI_BIT		(ULL(1) << 26)
+#define SCTLR_EnDA_BIT		(ULL(1) << 27)
+#define SCTLR_EnIB_BIT		(ULL(1) << 30)
 #define SCTLR_EnIA_BIT		(ULL(1) << 31)
 #define SCTLR_BT0_BIT		(ULL(1) << 35)
 #define SCTLR_BT1_BIT		(ULL(1) << 36)