From de964d7b784442e598ea40accff364a661ad893e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Feb 2024 09:58:20 +0100 Subject: [PATCH] boot/arm-trusted-firmware: fix hash checking Commit c6ab9328e13c6c9a1538b4a33824525a990b623d ("boot/arm-trusted-firmware: change BR_NO_CHECK_HASH_FOR logic") was written too hastily, and is actually broken as it does the reverse of what it should do. It really should disable the check when we're using a custom version/git/tarball of TF-A, not the opposite. Thanks to Romain for pointing out the problem, and providing an IRL patch to solve the issue. Reported-by: Romain Naour Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 89cdf48c70..2d554c1da8 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -25,7 +25,7 @@ ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif