Add PoC of Arm DRTM specification version Beta-0
Change-Id: I26e6f2d4b2299edc246f5e8504d5d15b1399f640
diff --git a/drivers/auth/mbedtls/mbedtls_common.c b/drivers/auth/mbedtls/mbedtls_common.c
index 4a8efae..39b4b1c 100644
--- a/drivers/auth/mbedtls/mbedtls_common.c
+++ b/drivers/auth/mbedtls/mbedtls_common.c
@@ -13,7 +13,7 @@
#include <common/debug.h>
#include <drivers/auth/mbedtls/mbedtls_common.h>
-#include <drivers/auth/mbedtls/mbedtls_config.h>
+#include MBEDTLS_CONFIG_FILE
#include <plat/common/platform.h>
static void cleanup(void)
@@ -36,7 +36,16 @@
if (atexit(cleanup))
panic();
+#if DRTM_SUPPORT && defined(IMAGE_BL31)
+ /*
+ * XXX-LPT: Short-circuit the mbedtls heap linkage for DRTM.
+ * The heap linkage should ideally be integrated with the other sub-
+ * systems that require it (e.g. trusted board boot).
+ */
+ err = get_mbedtls_heap_helper(&heap_addr, &heap_size);
+#else
err = plat_get_mbedtls_heap(&heap_addr, &heap_size);
+#endif
/* Ensure heap setup is proper */
if (err < 0) {