summaryrefslogtreecommitdiff
path: root/plat/arm/fvp
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2019-03-20 17:28:50 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-03-20 17:28:50 +0000
commitb4ddca80b1b20bf2f1870e9623b18e5c11139847 (patch)
tree7538138fb153c315c8103eb2191c93dd563a1754 /plat/arm/fvp
parentf2218e7b6a4f8c2c3d6db00703caad95f5e5b157 (diff)
parent9c9f92c4c4cd07ea75ea72a42f15b32ed4c01bf0 (diff)
Merge changes from topic "an/pauth"
* changes: Add ARMv8.3 pointer authentication support Remove pointer authentication test
Diffstat (limited to 'plat/arm/fvp')
-rw-r--r--plat/arm/fvp/platform.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/plat/arm/fvp/platform.mk b/plat/arm/fvp/platform.mk
index 0230124..9fb84c2 100644
--- a/plat/arm/fvp/platform.mk
+++ b/plat/arm/fvp/platform.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2019, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -23,4 +23,8 @@ CACTUS_SOURCES += plat/arm/fvp/${ARCH}/plat_helpers.S
# Firmware update is implemented on FVP.
FIRMWARE_UPDATE := 1
+ifeq (${ARCH},aarch64)
+PLAT_SOURCES += plat/common/aarch64/pauth.c
+endif
+
include plat/arm/common/arm_common.mk