From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] tf-a: Support enabling DEBUG via TF_A_EXTRA_ARGS
Date: Mon, 14 Mar 2022 11:14:33 +0100 [thread overview]
Message-ID: <20220314101433.2526053-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220309111852.537125-1-u.kleine-koenig@pengutronix.de>
Thanks, applied as 5608cc10e703b1d25acdfd2dd5de4338a3cbfa4e.
Michael
[sent from post-receive hook]
On Mon, 14 Mar 2022 11:14:33 +0100, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> 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>
> Message-Id: <20220309111852.537125-1-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/tf-a.make b/rules/tf-a.make
> index 25fdb0cd213a..2caa68d97054 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 $(filter DEBUG=1,$(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS))),debug,release)/$(TF_A_ARTIFACTS)), \
> install -v -D -m 644 $(artifact) \
> $(2)/$(1)-$(notdir $(artifact))$(ptx/nl))
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2022-03-14 10:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 10:42 [ptxdist] [PATCH] " Uwe Kleine-König
2022-03-09 10:47 ` Ahmad Fatoum
2022-03-09 10:56 ` Michael Olbrich
2022-03-09 11:18 ` [ptxdist] [PATCH v2] " Uwe Kleine-König
2022-03-14 10:14 ` 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=20220314101433.2526053-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
--cc=u.kleine-koenig@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