From: Ambroise Vincent <ambroise.vincent@arm.com>
Date: Thu, 11 Apr 2019 12:45:18 +0000 (+0100)
Subject: sgm: Fix bl2 sources
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e5be1f95e54d076279e39b0c2ad04685391cf8b9;p=project%2Fbcm63xx%2Fatf.git

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>
---

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