Commit 7cdb4347 authored by John Tsichritzis's avatar John Tsichritzis
Browse files

Support shared Mbed TLS heap for SGI



Change-Id: Iac454c745543842bfeed004aee7a3f4fb94d37e1
Signed-off-by: default avatarJohn Tsichritzis <john.tsichritzis@arm.com>
parent 37574c56
...@@ -11,4 +11,15 @@ ...@@ -11,4 +11,15 @@
compatible = "arm,tb_fw"; compatible = "arm,tb_fw";
hw_config_addr = <0x0 0xFEF00000>; hw_config_addr = <0x0 0xFEF00000>;
hw_config_max_size = <0x0100000>; hw_config_max_size = <0x0100000>;
/*
* The following two entries are placeholders for Mbed TLS
* heap information. The default values don't matter since
* they will be overwritten by BL1.
* In case of having shared Mbed TLS heap between BL1 and BL2,
* BL1 will populate these two properties with the respective
* info about the shared heap. This info will be available for
* BL2 in order to locate and re-use the heap.
*/
mbedtls_heap_addr = <0x0 0x0>;
mbedtls_heap_size = <0x0>;
}; };
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <arm_def.h> #include <arm_def.h>
#include <arm_spm_def.h> #include <arm_spm_def.h>
#include <assert.h>
#include <bl_common.h> #include <bl_common.h>
#include <ccn.h> #include <ccn.h>
#include <debug.h> #include <debug.h>
...@@ -63,6 +64,9 @@ const mmap_region_t plat_arm_mmap[] = { ...@@ -63,6 +64,9 @@ const mmap_region_t plat_arm_mmap[] = {
#endif #endif
#if ENABLE_SPM #if ENABLE_SPM
ARM_SP_IMAGE_MMAP, ARM_SP_IMAGE_MMAP,
#endif
#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2 && !BL2_AT_EL3
ARM_MAP_BL1_RW,
#endif #endif
{0} {0}
}; };
...@@ -143,3 +147,13 @@ const struct secure_partition_boot_info *plat_get_secure_partition_boot_info( ...@@ -143,3 +147,13 @@ const struct secure_partition_boot_info *plat_get_secure_partition_boot_info(
return &plat_arm_secure_partition_boot_info; return &plat_arm_secure_partition_boot_info;
} }
#endif /* ENABLE_SPM && defined(IMAGE_BL31) */ #endif /* ENABLE_SPM && defined(IMAGE_BL31) */
#if TRUSTED_BOARD_BOOT && LOAD_IMAGE_V2
int plat_get_mbedtls_heap(void **heap_addr, size_t *heap_size)
{
assert(heap_addr != NULL);
assert(heap_size != NULL);
return arm_get_mbedtls_heap(heap_addr, heap_size);
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment