commit 04c2b46179ef8e791e79a5245c3e03d3e4ec98d4
author Antonio Niño Díaz <antonio.ninodiaz@arm.com> Fri May 10 08:51:29 2019 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Fri May 10 08:51:29 2019 +0000
tree 4e4fd40726d8668efbe237b0fe6063b5de5203aa
parent 53e75825b04872775b5f27d09e6b672df2ba2914
parent 402bd5284c3947cf36663bf3545de65ab9e540e3

Merge "plat: imx8m: Implement IMX_SIP_BUILDINFO" into integration

Makefile

diff --git a/Makefile b/Makefile
index 41a64f9..16b4ccc 100644
--- a/Makefile
+++ b/Makefile
@@ -454,14 +454,20 @@
 # registers associated to it are also saved and restored. Not doing it would
 # leak the value of the key used by EL3 to EL1 and S-EL1.
 ifeq ($(ENABLE_PAUTH),1)
-    ifeq ($(CTX_INCLUDE_PAUTH_REGS),0)
+    ifneq ($(ARCH),aarch64)
+        $(error ENABLE_PAUTH=1 requires AArch64)
+    else ifeq ($(CTX_INCLUDE_PAUTH_REGS),0)
         $(error ENABLE_PAUTH=1 requires CTX_INCLUDE_PAUTH_REGS=1)
     else
         $(info ENABLE_PAUTH and CTX_INCLUDE_PAUTH_REGS are experimental features)
     endif
 else
     ifeq ($(CTX_INCLUDE_PAUTH_REGS),1)
-        $(info CTX_INCLUDE_PAUTH_REGS is an experimental feature)
+        ifneq ($(ARCH),aarch64)
+            $(error CTX_INCLUDE_PAUTH_REGS=1 requires AArch64)
+        else
+            $(info CTX_INCLUDE_PAUTH_REGS is an experimental feature)
+        endif
     endif
 endif