From d5584f07e31b8105285e7ee39f18fdf2c7d63877 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 23 Jun 2022 16:00:24 +0200 Subject: [PATCH] boot/arm-trusted-firmware: update condition for custom tarball management This patch updates the condition to handle custom tarballs as specified by the configuration. This change is made to have cleaner condition and for consistency. Signed-off-by: Kory Maincent Signed-off-by: Yann E. MORIN --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 356d2a8b6d..6b0405a44a 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -6,7 +6,7 @@ ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION)) -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) # Handle custom ATF tarballs as specified by the configuration ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL))) @@ -201,7 +201,7 @@ endef # Configuration check ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy) -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)),) $(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION) endif