Browse Source

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 <manish.badarkhe@arm.com>
Change-Id: I659ce8e54550946db253d23f150cca8b2fa7b880
pull/1988/merge
Manish V Badarkhe 3 years ago
committed by Manish V Badarkhe
parent
commit
c9bd1bacff
  1. 3
      plat/arm/board/fvp/platform.mk
  2. 3
      plat/arm/common/arm_common.mk
  3. 2
      plat/arm/common/arm_dyn_cfg.c

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

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

2
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];

Loading…
Cancel
Save