From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 Jun 2022 08:33:40 +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 1nx0sO-001VQv-6m for lore@lore.pengutronix.de; Fri, 03 Jun 2022 08:33:40 +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 1nx0sN-00012c-Dz; Fri, 03 Jun 2022 08:33:39 +0200 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nx0sD-00011z-VP; Fri, 03 Jun 2022 08:33:29 +0200 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1nx0sD-0003pg-CO; Fri, 03 Jun 2022 08:33:29 +0200 Date: Fri, 3 Jun 2022 08:33:29 +0200 From: Michael Olbrich To: Ahmad Fatoum Message-ID: <20220603063329.GW16749@pengutronix.de> Mail-Followup-To: Ahmad Fatoum , ptxdist@pengutronix.de, Christian Melki , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= References: <20220602063823.3045052-1-a.fatoum@pengutronix.de> <20220602063823.3045052-2-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220602063823.3045052-2-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:26:16 up 64 days, 18:55, 66 users, load average: 0.07, 0.12, 0.10 User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH 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 , ptxdist@pengutronix.de, Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= 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 On Thu, Jun 02, 2022 at 08:38:23AM +0200, Ahmad Fatoum wrote: > 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 > --- > rules/tf-a.make | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/rules/tf-a.make b/rules/tf-a.make > index 7695a4c546e3..e96aaf3aa6f9 100644 > --- a/rules/tf-a.make > +++ b/rules/tf-a.make > @@ -89,7 +89,8 @@ $(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)), \ > + $(foreach pattern, $(TF_A_ARTIFACTS), \ > + $(wildcard $(TF_A_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,$(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS))),debug,release)/$(pattern))), \ This gets rather long and use addprefix. Maybe like this: TF_A_EXTRA_ARGS := $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) This can be reuses in the TF_A_MAKE_OPT as well. TF_A_BINDIR := $(TF_A_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) [...] $(wildcard $(addprefix $(TF_A_BINDIR),$(TF_A_ARTIFACTS))), \ Michael > install -v -D -m 644 $(artifact) \ > $(2)/$(1)-$(notdir $(artifact))$(ptx/nl)) > > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |