aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanna Farley <joanna.farley@arm.com>2021-07-24 18:38:19 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-07-24 18:38:19 +0200
commite73d9d0fa8ffb843775956499d8a221eebf76ca2 (patch)
tree76554ad67c76f0a314dcc5e98e0db6c57734724c
parentd55d83090ef65d134c9974f8c02491919263acc8 (diff)
parent4429b47165eeee81fb8300c60a6832898c31db42 (diff)
downloadtrusted-firmware-a-e73d9d0fa8ffb843775956499d8a221eebf76ca2.tar.gz
Merge "refactor(aarch64): remove `FEAT_BTI` architecture check" into integration
-rw-r--r--include/arch/aarch64/asm_macros.S4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S
index 464c05be1a..7706cd831b 100644
--- a/include/arch/aarch64/asm_macros.S
+++ b/include/arch/aarch64/asm_macros.S
@@ -10,10 +10,6 @@
#include <common/asm_macros_common.S>
#include <lib/spinlock.h>
-#if ENABLE_BTI && !ARM_ARCH_AT_LEAST(8, 5)
-#error Branch Target Identification requires ARM_ARCH_MINOR >= 5
-#endif
-
/*
* TLBI instruction with type specifier that implements the workaround for
* errata 813419 of Cortex-A57 or errata 1286807 of Cortex-A76.