Re: [ptxdist] [PATCH 2/2] tf-a: support multiple wildcard patterns in TF_A_ARTIFACTS

[Michael Olbrich <m.olbrich@pengutronix.de>]

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