[ptxdist] [PATCH] tf-a: k3 needs an additional compile argument

[ptxdist] [PATCH] tf-a: k3 needs an additional compile argument

[Lars Schmidt]

In order to compile ARM Trusted Firmware-A for K3 platforms,
it needs TARGET_BOARD=lite set as make argument. The output files
are then located in a subdirectory.

Link: https://github.com/TexasInstruments/processor-sdk-doc/blob/0699d1bd5283d80c0adbd93035e361170dd36d98/source/linux/Foundational_Components_ATF.rst
Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
 rules/tf-a.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/tf-a.make b/rules/tf-a.make
index bff4edf6c..664f360c5 100644
--- a/rules/tf-a.make
+++ b/rules/tf-a.make
@@ -44,6 +44,7 @@ TF_A_WRAPPER_BLACKLIST	:= \
 
 TF_A_EXTRA_ARGS		:= $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS))
 TF_A_BINDIR		 = $(TF_A_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release)
+TF_A_BINDIR_BOARD	 = $(TF_A_BUILD_DIR)/$(1)/*/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release)
 TF_A_MAKE_OPT	:= \
 	-C $(TF_A_DIR) \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
@@ -93,7 +94,8 @@ 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))), \
+	$(wildcard $(addprefix $(TF_A_BINDIR)/, $(TF_A_ARTIFACTS))) \
+	$(wildcard $(addprefix $(TF_A_BINDIR_BOARD)/, $(TF_A_ARTIFACTS))), \
 	$(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)))
-- 
2.39.5

Re: [ptxdist] [APPLIED] tf-a: k3 needs an additional compile argument

[Michael Olbrich]

Thanks, applied as 48d020e6d457cb69f24aa327c3694e6eb17b017e.

Michael

[sent from post-receive hook]

On Sat, 17 May 2025 00:02:47 +0200, Lars Schmidt <l.schmidt@pengutronix.de> wrote:
> In order to compile ARM Trusted Firmware-A for K3 platforms,
> it needs TARGET_BOARD=lite set as make argument. The output files
> are then located in a subdirectory.
> 
> Link: https://github.com/TexasInstruments/processor-sdk-doc/blob/0699d1bd5283d80c0adbd93035e361170dd36d98/source/linux/Foundational_Components_ATF.rst
> Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
> Message-Id: <20250515135619.2599876-1-l.schmidt@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/tf-a.make b/rules/tf-a.make
> index bff4edf6c6ff..664f360c5a14 100644
> --- a/rules/tf-a.make
> +++ b/rules/tf-a.make
> @@ -44,6 +44,7 @@ TF_A_WRAPPER_BLACKLIST	:= \
>  
>  TF_A_EXTRA_ARGS		:= $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS))
>  TF_A_BINDIR		 = $(TF_A_BUILD_DIR)/$(1)/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release)
> +TF_A_BINDIR_BOARD	 = $(TF_A_BUILD_DIR)/$(1)/*/$(if $(filter DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release)
>  TF_A_MAKE_OPT	:= \
>  	-C $(TF_A_DIR) \
>  	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
> @@ -93,7 +94,8 @@ 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))), \
> +	$(wildcard $(addprefix $(TF_A_BINDIR)/, $(TF_A_ARTIFACTS))) \
> +	$(wildcard $(addprefix $(TF_A_BINDIR_BOARD)/, $(TF_A_ARTIFACTS))), \
>  	$(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)))