From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 01 Jul 2022 07:11:34 +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 1o78wF-002esV-FQ for lore@lore.pengutronix.de; Fri, 01 Jul 2022 07:11:34 +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 1o78wH-0003u2-RW; Fri, 01 Jul 2022 07:11:33 +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 1o78vP-00036D-3P; Fri, 01 Jul 2022 07:10:39 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1o78vK-003ieU-T6; Fri, 01 Jul 2022 07:10:38 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1o78vN-00FRed-Ai; Fri, 01 Jul 2022 07:10:37 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 1 Jul 2022 07:10:37 +0200 Message-Id: <20220701051037.3681180-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620140851.2349897-2-a.fatoum@pengutronix.de> References: <20220620140851.2349897-2-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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: Ahmad Fatoum 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 Thanks, applied as 0776a4aaf6e764356b37506efd28d03b2454a03a. Michael [sent from post-receive hook] On Fri, 01 Jul 2022 07:10:37 +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 > Message-Id: <20220620140851.2349897-2-a.fatoum@pengutronix.de> > [mol: remove one $() too many] > Signed-off-by: Michael Olbrich > > diff --git a/rules/tf-a.make b/rules/tf-a.make > index 7695a4c546e3..5fa0df941cc4 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)) >