diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-04-12 10:40:15 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-04-12 10:40:15 +0000 |
| commit | 72db70ca184c0db10d920923288bc2f1e009e19f (patch) | |
| tree | 14400d6a6fac2eb96472582adaaac3bbad9b58fc /plat/arm | |
| parent | 5e2f1ce276e10fbdf54ca9f8db38fe3f3fecd25a (diff) | |
| parent | 2374ab1799bedae1acc17fde0205d272f8111836 (diff) | |
Merge changes from topic "av/tls-heap" into integration
* changes:
Mbed TLS: Remove weak heap implementation
sgm: Fix bl2 sources
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/juno/juno_security.c | 10 | ||||
| -rw-r--r-- | plat/arm/css/sgm/sgm-common.mk | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/plat/arm/board/juno/juno_security.c b/plat/arm/board/juno/juno_security.c index 9d7f0e42..6566b15c 100644 --- a/plat/arm/board/juno/juno_security.c +++ b/plat/arm/board/juno/juno_security.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,6 +10,7 @@ #include <platform_def.h> #include <plat/arm/common/plat_arm.h> #include <plat/arm/soc/common/soc_css.h> +#include <plat/common/platform.h> #include "juno_tzmp1_def.h" @@ -144,3 +145,10 @@ void plat_arm_security_setup(void) init_v550(); #endif } + +#if TRUSTED_BOARD_BOOT +int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size) +{ + return get_mbedtls_heap_helper(heap_addr, heap_size); +} +#endif 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 |