summaryrefslogtreecommitdiff
path: root/plat/arm
diff options
context:
space:
mode:
authorAmbroise Vincent <ambroise.vincent@arm.com>2019-04-11 13:45:18 +0100
committerAmbroise Vincent <ambroise.vincent@arm.com>2019-04-11 13:48:15 +0100
commite5be1f95e54d076279e39b0c2ad04685391cf8b9 (patch)
tree24292396276d6b05b74a20af4679e8b6afca796b /plat/arm
parentc554e1ad82b0cf874a76e4685a4da61da14da1fe (diff)
sgm: Fix bl2 sources
The weak version of plat_get_mbedtls_heap() was being used. Change-Id: I6da331a098dd1af5bb64729d5b914cfb74b8869e Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
Diffstat (limited to 'plat/arm')
-rw-r--r--plat/arm/css/sgm/sgm-common.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/plat/arm/css/sgm/sgm-common.mk b/plat/arm/css/sgm/sgm-common.mk
index ddeac68a..0a136e63 100644
--- a/plat/arm/css/sgm/sgm-common.mk
+++ b/plat/arm/css/sgm/sgm-common.mk
@@ -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
#
@@ -12,7 +12,7 @@ PLAT_BL_COMMON_SOURCES := ${CSS_SGM_BASE}/sgm_mmap_config.c \
${CSS_SGM_BASE}/aarch64/css_sgm_helpers.S
SECURITY_SOURCES := drivers/arm/tzc/tzc_dmc500.c \
- plat/arm/common/arm_tzc_dmc500.c \
+ plat/arm/common/arm_tzc_dmc500.c \
${CSS_SGM_BASE}/sgm_security.c
SGM_CPU_SOURCES := lib/cpus/aarch64/cortex_a55.S \
@@ -30,10 +30,11 @@ SGM_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
BL1_SOURCES += $(SGM_CPU_SOURCES) \
${INTERCONNECT_SOURCES} \
- ${CSS_SGM_BASE}/sgm_bl1_setup.c \
+ ${CSS_SGM_BASE}/sgm_bl1_setup.c \
${CSS_SGM_BASE}/sgm_plat_config.c
-BL2_SOURCES += ${SECURITY_SOURCES}
+BL2_SOURCES += ${SECURITY_SOURCES} \
+ ${CSS_SGM_BASE}/sgm_plat_config.c
BL2U_SOURCES += ${SECURITY_SOURCES}
@@ -41,7 +42,7 @@ BL31_SOURCES += $(SGM_CPU_SOURCES) \
${INTERCONNECT_SOURCES} \
${SECURITY_SOURCES} \
${SGM_GIC_SOURCES} \
- ${CSS_SGM_BASE}/sgm_topology.c \
+ ${CSS_SGM_BASE}/sgm_topology.c \
${CSS_SGM_BASE}/sgm_bl31_setup.c \
${CSS_SGM_BASE}/sgm_plat_config.c