From c9bd1bacffd9697ec4ebac77e45588cf6c261a3b Mon Sep 17 00:00:00 2001 From: Manish V Badarkhe Date: Fri, 25 Feb 2022 09:06:57 +0000 Subject: [PATCH] feat(fvp): add crypto support in BL31 DRTM implementation needs crypto support in BL31 to calculate hash of various DRTM components Signed-off-by: Manish V Badarkhe Change-Id: I659ce8e54550946db253d23f150cca8b2fa7b880 --- plat/arm/board/fvp/platform.mk | 3 ++- plat/arm/common/arm_common.mk | 3 ++- plat/arm/common/arm_dyn_cfg.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 811b2754b..460227612 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -414,7 +414,8 @@ endif endif ifeq (${DRTM_SUPPORT}, 1) -BL31_SOURCES += plat/arm/board/fvp/fvp_drtm_dma_prot.c +BL31_SOURCES += plat/arm/board/fvp/fvp_drtm_dma_prot.c \ + plat/arm/common/arm_dyn_cfg.c endif ifeq (${TRUSTED_BOARD_BOOT}, 1) diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index bd59ec00a..5dda4853b 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -419,11 +419,12 @@ ifeq (${MEASURED_BOOT},1) BL2_SOURCES += ${EVENT_LOG_SOURCES} endif -ifneq ($(filter 1,${MEASURED_BOOT} ${TRUSTED_BOARD_BOOT}),) +ifneq ($(filter 1,${MEASURED_BOOT} ${TRUSTED_BOARD_BOOT} ${DRTM_SUPPORT}),) CRYPTO_SOURCES := drivers/auth/crypto_mod.c \ lib/fconf/fconf_tbbr_getter.c BL1_SOURCES += ${CRYPTO_SOURCES} BL2_SOURCES += ${CRYPTO_SOURCES} + BL31_SOURCES += drivers/auth/crypto_mod.c # We expect to locate the *.mk files under the directories specified below ifeq (${ARM_CRYPTOCELL_INTEG},0) diff --git a/plat/arm/common/arm_dyn_cfg.c b/plat/arm/common/arm_dyn_cfg.c index a62693c50..c88621e37 100644 --- a/plat/arm/common/arm_dyn_cfg.c +++ b/plat/arm/common/arm_dyn_cfg.c @@ -45,7 +45,7 @@ int arm_get_mbedtls_heap(void **heap_addr, size_t *heap_size) assert(heap_addr != NULL); assert(heap_size != NULL); -#if defined(IMAGE_BL1) || BL2_AT_EL3 +#if defined(IMAGE_BL1) || BL2_AT_EL3 || defined(IMAGE_BL31) /* If in BL1 or BL2_AT_EL3 define a heap */ static unsigned char heap[TF_MBEDTLS_HEAP_SIZE]; -- 2.39.5