From patchwork Thu Jun 23 14:00:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kory Maincent X-Patchwork-Id: 1647198 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LTMTk17ZPz9sGp for ; Fri, 24 Jun 2022 00:05:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C1D6E8472D; Thu, 23 Jun 2022 14:05:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C1D6E8472D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P5PRoC863UNf; Thu, 23 Jun 2022 14:05:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id DF28384770; Thu, 23 Jun 2022 14:05:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DF28384770 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 368061BF339 for ; Thu, 23 Jun 2022 14:05:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0331E84770 for ; Thu, 23 Jun 2022 14:05:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0331E84770 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B7rDsffH-qpC for ; Thu, 23 Jun 2022 14:05:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CD64B8472D Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by smtp1.osuosl.org (Postfix) with ESMTPS id CD64B8472D for ; Thu, 23 Jun 2022 14:05:07 +0000 (UTC) Received: from relay5-d.mail.gandi.net (unknown [IPv6:2001:4b98:dc4:8::225]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 18CF4D5955 for ; Thu, 23 Jun 2022 14:00:35 +0000 (UTC) Received: (Authenticated sender: kory.maincent@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id BE8051C0005; Thu, 23 Jun 2022 14:00:28 +0000 (UTC) To: buildroot@buildroot.org Date: Thu, 23 Jun 2022 16:00:24 +0200 Message-Id: <20220623140028.1315712-1-kory.maincent@bootlin.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1655992829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9us9C+f8MaPMl95yq4qmZMYbvzOBuL8KWL5/931NqTo=; b=aDow49Hfeoc8ltB/WaQYMelbLj0aabknLREMRqKLNEWB+ChrFvUHuH44A3hJxccLgE1m5c pMPv6rw1HtuRl4HbRb57MkClkKvcqVdh/raIQilBWHA5UPGINw2xjy3OSkQKVadAaY7hN9 6fFw9B2UyZb1O0Cmgnkkw0nlGwLJAWrukx2mjezdzBLlyWWOJgFZ3lsmA3LBFSjoJAwyZq UiTu34x0WohVTNGT9ymnQSo1Kom7cMY0Rddd97SOIEmq59NgcD0dimvPXLzf/vT9MVDe38 gDj+vFF8X7RvKMtdiBlnj47CLjcefDGgzD3WdK1Hx4a1gUol/sJYSD96Zlf1fA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=gm1 header.b=aDow49Hf Subject: [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kory Maincent via buildroot From: Kory Maincent Reply-To: kory.maincent@bootlin.com Cc: Kory Maincent , Sergey Matyukevich , thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Kory Maincent 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 --- Notes: This patch is based on this other one: https://lists.buildroot.org/pipermail/buildroot/2022-June/645216.html 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 965b1a2eb5..421d8c770d 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))) @@ -190,7 +190,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