aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2019-04-30 15:43:21 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-04-30 15:43:21 +0000
commit29162843779552d3d28878cd8031bc032cba421e (patch)
treee04b0eec7789b7d7ac718202752ca393ff46f191 /plat
parent19b4f689c6f58cb2da9377bcec32c79a97d3fb73 (diff)
parent2a3c645b40ebb5149f6e043babccd95469867030 (diff)
Merge changes from topic "lm/stack_protector" into integration
* changes: juno: Add security sources for tsp-juno Add support for default stack-protector flag
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/board/juno/tsp/tsp-juno.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/plat/arm/board/juno/tsp/tsp-juno.mk b/plat/arm/board/juno/tsp/tsp-juno.mk
index 52461cf8..be75c4d7 100644
--- a/plat/arm/board/juno/tsp/tsp-juno.mk
+++ b/plat/arm/board/juno/tsp/tsp-juno.mk
@@ -1,11 +1,12 @@
#
-# Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
BL32_SOURCES += plat/arm/board/juno/juno_topology.c \
plat/arm/css/common/css_topology.c \
- ${JUNO_GIC_SOURCES}
+ ${JUNO_GIC_SOURCES} \
+ ${JUNO_SECURITY_SOURCES}
include plat/arm/common/tsp/arm_tsp.mk