From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 02 Jan 2023 12:11:08 +0100 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 1pCIij-00Grw7-05 for lore@lore.pengutronix.de; Mon, 02 Jan 2023 12:11:08 +0100 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 1pCIih-0000jM-0g; Mon, 02 Jan 2023 12:11:07 +0100 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 1pCIiW-0000j0-Sk; Mon, 02 Jan 2023 12:10:56 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pCIiW-003KfT-8h; Mon, 02 Jan 2023 12:10:56 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pCIiV-00ESE0-Hp; Mon, 02 Jan 2023 12:10:55 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 2 Jan 2023 12:10:45 +0100 Message-Id: <20230102111045.3432797-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221227193233.50887-1-avazquez.dev@gmail.com> References: <20221227193233.50887-1-avazquez.dev@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] tf-a: use ptx/image-install 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: Alejandro Vazquez , Michael Olbrich 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 TF_A_ARTIFACTS_SRC is not defined, so the custom clean stage does not work as expected. Instead of fixing this, use ptx/image-install so that the generic image removal mechanism works correctly. Signed-off-by: Michael Olbrich --- I've created this instead. ptx/image-install should be used here, so that ptxdist knows about the files and can remove them automatically. Michael rules/tf-a.make | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/rules/tf-a.make b/rules/tf-a.make index ac1bff0322b4..54fe7d1e37d8 100644 --- a/rules/tf-a.make +++ b/rules/tf-a.make @@ -89,16 +89,18 @@ $(STATEDIR)/tf-a.compile: # Install # ---------------------------------------------------------------------------- +tf-a/inst_pkgdir = \ + install -v -D -m 644 $(2) $(TF_A_PKGDIR)/usr/lib/firmware/$(3) + tf-a/inst_plat = $(foreach artifact, \ $(wildcard $(addprefix $(TF_A_BINDIR)/, $(TF_A_ARTIFACTS))), \ - install -v -D -m 644 $(artifact) \ - $(2)/$(1)-$(notdir $(artifact))$(ptx/nl)) + $(call $(2),TF_A,$(artifact),$(1)-$(notdir $(artifact)))$(ptx/nl)) tf-a/inst_bins = $(foreach plat, $(TF_A_PLATFORMS), $(call tf-a/inst_plat,$(plat),$(1))) $(STATEDIR)/tf-a.install: @$(call targetinfo) - @$(call tf-a/inst_bins,$(TF_A_PKGDIR)/usr/lib/firmware) + @$(call tf-a/inst_bins,tf-a/inst_pkgdir) @$(call touch) # ---------------------------------------------------------------------------- @@ -107,16 +109,7 @@ $(STATEDIR)/tf-a.install: $(STATEDIR)/tf-a.targetinstall: @$(call targetinfo) - @$(call tf-a/inst_bins,$(IMAGEDIR)) + @$(call tf-a/inst_bins,ptx/image-install) @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/tf-a.clean: - @$(call targetinfo) - @rm -vf $(addprefix $(IMAGEDIR)/, $(notdir $(TF_A_ARTIFACTS_SRC))) - @$(call clean_pkg, TF_A) - # vim: syntax=make -- 2.30.2