aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2020-10-06 16:09:00 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-10-06 16:09:00 +0000
commitb8f84577aaf1718ba3923527410d1e2b7788c9de (patch)
treecc6f374aaa93135982995b8686972ba36a58e841
parent3fad9960c57974da38118a98743ea1cc4ae878d9 (diff)
parent3bfcc9d700c93992ea900f5790e9ad4be04a0db8 (diff)
downloadtrusted-firmware-a-b8f84577aaf1718ba3923527410d1e2b7788c9de.tar.gz
Merge "plat/arm: common: add guard for arm_get_rotpk_info_regs" into integration
-rw-r--r--plat/arm/board/common/board_arm_trusted_boot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c
index 8239e0d1a7..66cc3e9496 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)