aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2019-08-02 06:49:32 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-08-02 06:49:32 +0000
commitf70889bee012047998ec9fd0942eca9f99120c67 (patch)
treeb47d5b879a4a3ef00ed1c2fb5553d839c15f1d31
parent6927d85a0429bd247cb76b7cb4201e330fc745a1 (diff)
parent38c645cbe3089e6878a75a5d3e41a7dcfdc26286 (diff)
downloadtf-a-tests-f70889bee012047998ec9fd0942eca9f99120c67.tar.gz
Merge "TF-A Tests: Pick up changes from TF-A code base"
-rw-r--r--include/lib/aarch64/arch.h4
-rw-r--r--include/lib/libc/aarch64/stdint_.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h
index 511854d..c839d1a 100644
--- a/include/lib/aarch64/arch.h
+++ b/include/lib/aarch64/arch.h
@@ -244,7 +244,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)
@@ -255,6 +255,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_DSSBS_BIT (ULL(1) << 44)
#define SCTLR_RESET_VAL SCTLR_EL3_RES1
diff --git a/include/lib/libc/aarch64/stdint_.h b/include/lib/libc/aarch64/stdint_.h
index b99be30..b17a435 100644
--- a/include/lib/libc/aarch64/stdint_.h
+++ b/include/lib/libc/aarch64/stdint_.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -116,3 +116,6 @@ typedef unsigned long uintmax_t;
typedef long register_t;
typedef unsigned long u_register_t;
+
+typedef __int128 int128_t;
+typedef unsigned __int128 uint128_t;