From 3bfcc9d700c93992ea900f5790e9ad4be04a0db8 Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Mon, 5 Oct 2020 10:18:52 +0100 Subject: [PATCH] plat/arm: common: add guard for arm_get_rotpk_info_regs Only define arm_get_rotpk_info_regs if ROTPK is in registers, i.e. (ARM_ROTPK_LOCATION_ID == ARM_ROTPK_REGS_ID). This will allow platform build without definition of TZ_PUB_KEY_HASH_BASE if dedicated registers for ROTPK are not available on the platform. Change-Id: I74ee2d5007f5d876a031a1efca20ebee2dede0c7 Signed-off-by: Usama Arif --- plat/arm/board/common/board_arm_trusted_boot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c index 8239e0d1a..66cc3e949 100644 --- a/plat/arm/board/common/board_arm_trusted_boot.c +++ b/plat/arm/board/common/board_arm_trusted_boot.c @@ -47,8 +47,11 @@ uintptr_t nv_cntr_base_addr[MAX_NV_CTR_IDS] = { extern unsigned char arm_rotpk_header[], arm_rotpk_hash_end[]; +#if (ARM_ROTPK_LOCATION_ID == ARM_ROTPK_REGS_ID) || ARM_CRYPTOCELL_INTEG static unsigned char rotpk_hash_der[ARM_ROTPK_HEADER_LEN + ARM_ROTPK_HASH_LEN]; +#endif +#if (ARM_ROTPK_LOCATION_ID == ARM_ROTPK_REGS_ID) /* * Return the ROTPK hash stored in dedicated registers. */ @@ -85,6 +88,7 @@ int arm_get_rotpk_info_regs(void **key_ptr, unsigned int *key_len, *flags = ROTPK_IS_HASH; return 0; } +#endif #if (ARM_ROTPK_LOCATION_ID == ARM_ROTPK_DEVEL_RSA_ID) || \ (ARM_ROTPK_LOCATION_ID == ARM_ROTPK_DEVEL_ECDSA_ID)