public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Anton Mikanovich <amikan@ilbers.de>, isar-users@googlegroups.com
Subject: Re: [PATCH] u-boot: Improve extra template variables usage
Date: Wed, 22 May 2024 16:12:40 +0200	[thread overview]
Message-ID: <955cd185-9cdf-4f95-8ebe-12fd0e79a475@siemens.com> (raw)
In-Reply-To: <20240522115610.857600-1-amikan@ilbers.de>

On 22.05.24 13:56, Anton Mikanovich wrote:
> Commit 1b0ea08f introduced BL31 and TEE variables to be used in custom
> u-boot recipes. Summorize them to U_BOOT_EXTRA_BUILDARGS (with default
> to the same values) to allow any custom variables to be set.
> 

"Summarize"

> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/recipes-bsp/u-boot/files/debian/rules.tmpl | 2 +-
>  meta/recipes-bsp/u-boot/u-boot-custom.inc       | 4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-bsp/u-boot/files/debian/rules.tmpl b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl
> index 53c85451..f4c161aa 100755
> --- a/meta/recipes-bsp/u-boot/files/debian/rules.tmpl
> +++ b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl
> @@ -14,7 +14,7 @@ endif
>  
>  override_dh_auto_build:
>  	$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG}
> -	$(MAKE) $(PARALLEL_MAKE) BL31=${BL31} TEE=${TEE} ${U_BOOT_BIN}
> +	$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_EXTRA_BUILDARGS} ${U_BOOT_BIN}
>  	$(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \
>  		$(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \
>  	else \
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> index 017e8336..a7b6cb0b 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -22,9 +22,11 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
>  
>  U_BOOT_BIN_INSTALL ?= "${U_BOOT_BIN}"
>  
> +U_BOOT_EXTRA_BUILDARGS ??= "BL31=${BL31} TEE=${TEE}"
> +
>  TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
>  TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN \
> -    BL31 TEE"
> +    U_BOOT_EXTRA_BUILDARGS"
>  
>  U_BOOT_TOOLS_PACKAGE ?= "0"
>  U_BOOT_CONFIG_PACKAGE ?= "0"

Yeah, that is probably more future-proof than hoping U-Boot will not
rename those vars again or add more.

Jan

-- 
Siemens AG, Technology
Linux Expert Center


      reply	other threads:[~2024-05-22 14:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-22 11:56 Anton Mikanovich
2024-05-22 14:12 ` Jan Kiszka [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=955cd185-9cdf-4f95-8ebe-12fd0e79a475@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=amikan@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /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