[ptxdist] [PATCH] tf-a: Support enabling DEBUG via TF_A_EXTRA_ARGS

["Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>]

With DEBUG=1 the resulting images are located in a different folder, so
adapt the install target accordingly. Before this adaption the build
either failed when DEBUG=1 was contained in TF_A_EXTRA_ARGS (because no
images were found in the release folder) or (IMHO worse) ptxdist picked
up the build results of an earlier attempt where DEBUG
wasn't set yet in TF_A_EXTRA_ARGS.

Also remove DEBUG=0 from the hardcoded set of options. This is the
default in the tf-a Makefiles anyhow, and passing both DEBUG=0 and
DEBUG=1 only results in confusion.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/tf-a.make | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules/tf-a.make b/rules/tf-a.make
index 25fdb0cd213a..72e1bab69371 100644
--- a/rules/tf-a.make
+++ b/rules/tf-a.make
@@ -45,7 +45,6 @@ TF_A_MAKE_OPT	:= \
 	-C $(TF_A_DIR) \
 	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
 	HOSTCC=$(HOSTCC) \
-	DEBUG=0 \
 	ARCH=$(PTXCONF_TF_A_ARCH_STRING) \
 	ARM_ARCH_MAJOR=$(PTXCONF_TF_A_ARM_ARCH_MAJOR) \
 	BUILD_STRING=$(PTXCONF_TF_A_VERSION) \
@@ -90,7 +89,7 @@ $(STATEDIR)/tf-a.compile:
 # ----------------------------------------------------------------------------
 
 tf-a/inst_plat = $(foreach artifact, \
-	$(wildcard $(TF_A_BUILDDIR)/$(1)/release/$(TF_A_ARTIFACTS)), \
+	$(wildcard $(TF_A_BUILDDIR)/$(1)/$(if $(find DEBUG=1,$(PTXCONF_TF_A_EXTRA_ARGS)),debug,release)/$(TF_A_ARTIFACTS)), \
 	install -v -D -m 644 $(artifact) \
 		$(2)/$(1)-$(notdir $(artifact))$(ptx/nl))
 
-- 
2.34.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de