From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alejandro Vazquez <avazquez.dev@gmail.com>,
Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [ptxdist] [PATCH] tf-a: use ptx/image-install
Date: Mon, 2 Jan 2023 12:10:45 +0100 [thread overview]
Message-ID: <20230102111045.3432797-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20221227193233.50887-1-avazquez.dev@gmail.com>
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 <m.olbrich@pengutronix.de>
---
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
prev parent reply other threads:[~2023-01-02 11:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 19:32 [ptxdist] [PATCH] tf-a: Fix empty variable in clean avazquez.dev
2023-01-02 11:10 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230102111045.3432797-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=avazquez.dev@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox