From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 20 Jun 2022 16:09:29 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o3I5o-0089C1-HN for lore@lore.pengutronix.de; Mon, 20 Jun 2022 16:09:29 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o3I5o-00066J-Sw; Mon, 20 Jun 2022 16:09:28 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o3I5G-00065A-8P; Mon, 20 Jun 2022 16:08:54 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1o3I5D-001eYW-Vy; Mon, 20 Jun 2022 16:08:53 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1o3I5E-009rMl-MT; Mon, 20 Jun 2022 16:08:52 +0200 From: Ahmad Fatoum To: ptxdist@pengutronix.de Date: Mon, 20 Jun 2022 16:08:51 +0200 Message-Id: <20220620140851.2349897-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620140851.2349897-1-a.fatoum@pengutronix.de> References: <20220620140851.2349897-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki , Ahmad Fatoum , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false To assemble FIT images outside TF-A, we will need to collect more than can be expressed by a single wildcard, so extend TF_A_ARTIFACTS to support multiple space separated patterns. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - predefine TF_A_EXTRA_ARGS and TF_A_BINDIR to simplify (mol) - use addprefix instead of nested foreach --- rules/tf-a.make | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/tf-a.make b/rules/tf-a.make index 7695a4c546e3..3f0815a8a6ee 100644 --- a/rules/tf-a.make +++ b/rules/tf-a.make @@ -40,6 +40,8 @@ TF_A_ARTIFACTS := $(call remove_quotes, $(PTXCONF_TF_A_ARTIFACTS)) TF_A_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) +TF_A_EXTRA_ARGS := $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) +TF_A_BINDIR = $(TF_A_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) TF_A_PATH := PATH=$(CROSS_PATH) TF_A_MAKE_OPT := \ -C $(TF_A_DIR) \ @@ -48,7 +50,7 @@ TF_A_MAKE_OPT := \ ARCH=$(PTXCONF_TF_A_ARCH_STRING) \ ARM_ARCH_MAJOR=$(PTXCONF_TF_A_ARM_ARCH_MAJOR) \ BUILD_STRING=$(PTXCONF_TF_A_VERSION) \ - $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) \ + $(TF_A_EXTRA_ARGS) \ all ifdef PTXCONF_TF_A_BL32_TSP @@ -89,7 +91,7 @@ $(STATEDIR)/tf-a.compile: # ---------------------------------------------------------------------------- tf-a/inst_plat = $(foreach artifact, \ - $(wildcard $(TF_A_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,$(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS))),debug,release)/$(TF_A_ARTIFACTS)), \ + $(wildcard $(addprefix $(TF_A_BINDIR)/, $($(TF_A_ARTIFACTS)))), \ install -v -D -m 644 $(artifact) \ $(2)/$(1)-$(notdir $(artifact))$(ptx/nl)) -- 2.30.2