From: laurenw-arm Date: Tue, 13 Dec 2022 15:42:40 +0000 (-0600) Subject: fix(arm): arm_rotpk_header undefined reference X-Git-Tag: baikal/aarch64/sdk5.10~1^2~298^2 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=95302e4b234589e0487996a5c0f1e111c21ffedc;p=arm-tf.git fix(arm): arm_rotpk_header undefined reference Moving ARM_ROTPK_S to default to arm_dev_rotpk.S as it was not being set for Juno cryptocell and this should be the value in most cases. Change-Id: I56a5a4e61f1ca728b87322b0b09a0d73ed1d5ee0 Signed-off-by: Lauren Wehrmeister --- diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk index 1f59a4ffc..d73c2e3a3 100644 --- a/plat/arm/board/common/board_common.mk +++ b/plat/arm/board/common/board_common.mk @@ -12,6 +12,7 @@ BL1_SOURCES += drivers/cfi/v2m/v2m_flash.c BL2_SOURCES += drivers/cfi/v2m/v2m_flash.c ifneq (${TRUSTED_BOARD_BOOT},0) +ARM_ROTPK_S = plat/arm/board/common/rotpk/arm_dev_rotpk.S ifneq (${ARM_CRYPTOCELL_INTEG}, 1) # ROTPK hash location ifeq (${ARM_ROTPK_LOCATION}, regs) @@ -20,7 +21,6 @@ else ifeq (${ARM_ROTPK_LOCATION}, devel_rsa) CRYPTO_ALG=rsa ARM_ROTPK_LOCATION_ID = ARM_ROTPK_DEVEL_RSA_ID ARM_ROTPK_HASH = plat/arm/board/common/rotpk/arm_rotpk_rsa_sha256.bin - ARM_ROTPK_S = plat/arm/board/common/rotpk/arm_dev_rotpk.S $(eval $(call add_define_val,ARM_ROTPK_HASH,'"$(ARM_ROTPK_HASH)"')) $(BUILD_PLAT)/bl2/arm_dev_rotpk.o : $(ARM_ROTPK_HASH) $(warning Development keys support for FVP is deprecated. Use `regs` \ @@ -29,7 +29,6 @@ else ifeq (${ARM_ROTPK_LOCATION}, devel_ecdsa) CRYPTO_ALG=ec ARM_ROTPK_LOCATION_ID = ARM_ROTPK_DEVEL_ECDSA_ID ARM_ROTPK_HASH = plat/arm/board/common/rotpk/arm_rotpk_ecdsa_sha256.bin - ARM_ROTPK_S = plat/arm/board/common/rotpk/arm_dev_rotpk.S $(eval $(call add_define_val,ARM_ROTPK_HASH,'"$(ARM_ROTPK_HASH)"')) $(BUILD_PLAT)/bl2/arm_dev_rotpk.o : $(ARM_ROTPK_HASH) $(warning Development keys support for FVP is deprecated. Use `regs` \