[ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe
@ 2022-06-20 14:08 Ahmad Fatoum
  2022-06-20 14:08 ` [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS Ahmad Fatoum
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2022-06-20 14:08 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki, Ahmad Fatoum, Uwe Kleine-König

FIP is becoming the standard for firmware booted by ARM Trusted
Firmware. While TF-A provides a fip target to assemble such images,
building them outside the TF-A build by means of fiptool (e.g. via
genimage[0]) can provide more flexibility.
Add a host-tf-a rule to facilitate this.

[0]: https://github.com/pengutronix/genimage/pull/190

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - move to hosttools_platform (mol)
  - depend on TF_A for default y if ALLYES (mol)
---
 platforms/host-tf-a.in |  7 +++++++
 rules/host-tf-a.make   | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 platforms/host-tf-a.in
 create mode 100644 rules/host-tf-a.make

diff --git a/platforms/host-tf-a.in b/platforms/host-tf-a.in
new file mode 100644
index 000000000000..c5e7d843b034
--- /dev/null
+++ b/platforms/host-tf-a.in
@@ -0,0 +1,7 @@
+### SECTION=hosttools_platform
+
+config HOST_TF_A
+	tristate
+	default y if ALLYES && TF_A
+	help
+	  This provides fiptool
diff --git a/rules/host-tf-a.make b/rules/host-tf-a.make
new file mode 100644
index 000000000000..9b4a94f7ab93
--- /dev/null
+++ b/rules/host-tf-a.make
@@ -0,0 +1,20 @@
+# -*-makefile-*-
+# Copyright (C) 2021 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_TF_A) += host-tf-a
+
+HOST_TF_A_MAKE_OPT = fiptool
+
+$(STATEDIR)/host-tf-a.install:
+	@$(call targetinfo)
+	install -vD -m755 $(HOST_TF_A_DIR)/tools/fiptool/fiptool $(HOST_TF_A_PKGDIR)/bin/fiptool
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2




^ permalink raw reply	[flat|nested] 6+ messages in thread

* [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS
  2022-06-20 14:08 [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
@ 2022-06-20 14:08 ` Ahmad Fatoum
  2022-06-24  7:42   ` Michael Olbrich
  2022-07-01  5:10   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-06-20 14:10 ` [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
  2022-07-01  5:10 ` [ptxdist] [APPLIED] " Michael Olbrich
  2 siblings, 2 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2022-06-20 14:08 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki, Ahmad Fatoum, Uwe Kleine-König

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 <a.fatoum@pengutronix.de>
---
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




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS
  2022-06-20 14:08 ` [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS Ahmad Fatoum
@ 2022-06-24  7:42   ` Michael Olbrich
  2022-07-01  5:10   ` [ptxdist] [APPLIED] " Michael Olbrich
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2022-06-24  7:42 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: Christian Melki, ptxdist, Uwe Kleine-König

On Mon, Jun 20, 2022 at 04:08:51PM +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 <a.fatoum@pengutronix.de>
> ---
> 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)))), \
                    ----------------------------^^

one $() too many here. I'll fix it while applying.

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 |



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [APPLIED] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS
  2022-06-20 14:08 ` [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS Ahmad Fatoum
  2022-06-24  7:42   ` Michael Olbrich
@ 2022-07-01  5:10   ` Michael Olbrich
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2022-07-01  5:10 UTC (permalink / raw)
  To: ptxdist; +Cc: Ahmad Fatoum

Thanks, applied as 0776a4aaf6e764356b37506efd28d03b2454a03a.

Michael

[sent from post-receive hook]

On Fri, 01 Jul 2022 07:10:37 +0200, Ahmad Fatoum <a.fatoum@pengutronix.de> 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 <a.fatoum@pengutronix.de>
> Message-Id: <20220620140851.2349897-2-a.fatoum@pengutronix.de>
> [mol: remove one $() too many]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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))
>  



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe
  2022-06-20 14:08 [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
  2022-06-20 14:08 ` [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS Ahmad Fatoum
@ 2022-06-20 14:10 ` Ahmad Fatoum
  2022-07-01  5:10 ` [ptxdist] [APPLIED] " Michael Olbrich
  2 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2022-06-20 14:10 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki, Uwe Kleine-König

On 20.06.22 16:08, Ahmad Fatoum wrote:
> diff --git a/platforms/host-tf-a.in b/platforms/host-tf-a.in
> new file mode 100644
> index 000000000000..c5e7d843b034
> --- /dev/null
> +++ b/platforms/host-tf-a.in
> @@ -0,0 +1,7 @@
> +### SECTION=hosttools_platform

Argh, one # too much. Please tell if I need to resend.



-- 
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 |



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [APPLIED] tf-a: add new host-tf-a recipe
  2022-06-20 14:08 [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
  2022-06-20 14:08 ` [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS Ahmad Fatoum
  2022-06-20 14:10 ` [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
@ 2022-07-01  5:10 ` Michael Olbrich
  2 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2022-07-01  5:10 UTC (permalink / raw)
  To: ptxdist; +Cc: Ahmad Fatoum

Thanks, applied as d59bebc85e324c5de3c2b63423415de0938869d8.

Michael

[sent from post-receive hook]

On Fri, 01 Jul 2022 07:10:35 +0200, Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> FIP is becoming the standard for firmware booted by ARM Trusted
> Firmware. While TF-A provides a fip target to assemble such images,
> building them outside the TF-A build by means of fiptool (e.g. via
> genimage[0]) can provide more flexibility.
> Add a host-tf-a rule to facilitate this.
> 
> [0]: https://github.com/pengutronix/genimage/pull/190
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Message-Id: <20220620140851.2349897-1-a.fatoum@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/host-tf-a.in b/platforms/host-tf-a.in
> new file mode 100644
> index 000000000000..1a299f042724
> --- /dev/null
> +++ b/platforms/host-tf-a.in
> @@ -0,0 +1,7 @@
> +## SECTION=hosttools_platform
> +
> +config HOST_TF_A
> +	tristate
> +	default y if ALLYES && TF_A
> +	help
> +	  This provides fiptool
> diff --git a/rules/host-tf-a.make b/rules/host-tf-a.make
> new file mode 100644
> index 000000000000..9b4a94f7ab93
> --- /dev/null
> +++ b/rules/host-tf-a.make
> @@ -0,0 +1,20 @@
> +# -*-makefile-*-
> +# Copyright (C) 2021 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_TF_A) += host-tf-a
> +
> +HOST_TF_A_MAKE_OPT = fiptool
> +
> +$(STATEDIR)/host-tf-a.install:
> +	@$(call targetinfo)
> +	install -vD -m755 $(HOST_TF_A_DIR)/tools/fiptool/fiptool $(HOST_TF_A_PKGDIR)/bin/fiptool
> +	@$(call touch)
> +
> +# vim: syntax=make



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-07-01  5:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-20 14:08 [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
2022-06-20 14:08 ` [ptxdist] [PATCH v2 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS Ahmad Fatoum
2022-06-24  7:42   ` Michael Olbrich
2022-07-01  5:10   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-06-20 14:10 ` [ptxdist] [PATCH v2 1/2] tf-a: add new host-tf-a recipe Ahmad Fatoum
2022-07-01  5:10 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox