From 7477196c9b7890a2df35ae17d762a26c7831c13d Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 5 Feb 2020 15:58:34 +0100 Subject: [PATCH] image-types_digi.bbclass: fix imx-mkimage dependency with sign mode is AHAB Commit 5beec04b ("trustfence: Add Trustfence support for CCMX8X") introduces a dependency when the imx-mkimage recipe and the SIGN_MODE is equal to AHAB. However this dependency should be added only when the TRUSTFENCE_SIGN is equal to 1 and when the SIGN_MODE is equal to AHAB, not only when the SIGN_MODE is equal to AHAB. This commit introduces this double check. Signed-off-by: Arturo Buzarra --- meta-digi-arm/classes/image_types_digi.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 5ebdbf869..de4a07564 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -216,8 +216,8 @@ trustence_sign_cpio() { } CONVERSIONTYPES += "tf" CONVERSION_CMD_tf = "trustence_sign_cpio ${IMAGE_NAME}.rootfs.${type}" -CONVERSION_DEPENDS_tf = "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" -CONVERSION_DEPENDS_tf += "${@oe.utils.conditional('SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" +CONVERSION_DEPENDS_tf = "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', \ + oe.utils.conditional('SIGN_MODE', 'AHAB', 'trustfence-sign-tools-native imx-mkimage', 'trustfence-sign-tools-native', d), '', d)}" IMAGE_TYPES += "cpio.gz.u-boot.tf" ################################################################################