Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management
@ 2022-06-23 14:00 Kory Maincent via buildroot
  2022-06-23 14:00 ` [Buildroot] [PATCH 2/4] boot/u-boot: " Kory Maincent via buildroot
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Kory Maincent via buildroot @ 2022-06-23 14:00 UTC (permalink / raw)
  To: buildroot; +Cc: Kory Maincent, Sergey Matyukevich, thomas.petazzoni

From: Kory Maincent <kory.maincent@bootlin.com>

This patch updates the condition to handle custom tarballs as specified by
the configuration. This change is made to have cleaner condition and for
consistency.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---

Notes:
    This patch is based on this other one:
    https://lists.buildroot.org/pipermail/buildroot/2022-June/645216.html

 boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 965b1a2eb5..421d8c770d 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -6,7 +6,7 @@
 
 ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
 
-ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y)
 # Handle custom ATF tarballs as specified by the configuration
 ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))
 ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL)))
@@ -190,7 +190,7 @@ endef
 # Configuration check
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy)
 
-ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y)
 ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)),)
 $(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)
 endif
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/4] boot/u-boot: update condition for custom tarball management
  2022-06-23 14:00 [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management Kory Maincent via buildroot
@ 2022-06-23 14:00 ` Kory Maincent via buildroot
  2022-06-23 14:00 ` [Buildroot] [PATCH 3/4] boot/barebox: " Kory Maincent via buildroot
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Kory Maincent via buildroot @ 2022-06-23 14:00 UTC (permalink / raw)
  To: buildroot; +Cc: Kory Maincent, thomas.petazzoni

From: Kory Maincent <kory.maincent@bootlin.com>

This patch updates the condition to handle custom tarballs as specified by
the configuration. This change is made to have cleaner condition and for
consistency.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 boot/uboot/uboot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 5808e30818..ebc8384d1d 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -20,7 +20,7 @@ UBOOT_INSTALL_IMAGES = YES
 UBOOT_DEPENDENCIES = host-pkgconf $(BR2_MAKE_HOST_DEPENDENCY)
 UBOOT_MAKE = $(BR2_MAKE)
 
-ifeq ($(UBOOT_VERSION),custom)
+ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y)
 # Handle custom U-Boot tarballs as specified by the configuration
 UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
 UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 3/4] boot/barebox: update condition for custom tarball management
  2022-06-23 14:00 [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management Kory Maincent via buildroot
  2022-06-23 14:00 ` [Buildroot] [PATCH 2/4] boot/u-boot: " Kory Maincent via buildroot
@ 2022-06-23 14:00 ` Kory Maincent via buildroot
  2022-06-23 14:00 ` [Buildroot] [PATCH 4/4] boot/opensbi: " Kory Maincent via buildroot
  2022-07-23 20:12 ` [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: " Yann E. MORIN
  3 siblings, 0 replies; 5+ messages in thread
From: Kory Maincent via buildroot @ 2022-06-23 14:00 UTC (permalink / raw)
  To: buildroot; +Cc: Kory Maincent, thomas.petazzoni

From: Kory Maincent <kory.maincent@bootlin.com>

This patch updates the condition to handle custom tarballs as specified by
the configuration. This change is made to have cleaner condition and for
consistency.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 boot/barebox/barebox.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 6506294d6d..da151d3c25 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -17,7 +17,7 @@ define inner-barebox-package
 
 $(1)_VERSION = $$(call qstrip,$$(BR2_TARGET_BAREBOX_VERSION))
 
-ifeq ($$($(1)_VERSION),custom)
+ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL),y)
 # Handle custom Barebox tarballs as specified by the configuration
 $(1)_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
 $(1)_SITE = $$(patsubst %/,%,$$(dir $$($(1)_TARBALL)))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 4/4] boot/opensbi: update condition for custom tarball management
  2022-06-23 14:00 [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management Kory Maincent via buildroot
  2022-06-23 14:00 ` [Buildroot] [PATCH 2/4] boot/u-boot: " Kory Maincent via buildroot
  2022-06-23 14:00 ` [Buildroot] [PATCH 3/4] boot/barebox: " Kory Maincent via buildroot
@ 2022-06-23 14:00 ` Kory Maincent via buildroot
  2022-07-23 20:12 ` [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: " Yann E. MORIN
  3 siblings, 0 replies; 5+ messages in thread
From: Kory Maincent via buildroot @ 2022-06-23 14:00 UTC (permalink / raw)
  To: buildroot; +Cc: Kory Maincent, Alistair Francis, thomas.petazzoni

From: Kory Maincent <kory.maincent@bootlin.com>

This patch updates the condition to handle custom tarballs as specified by
the configuration. This change is made to have cleaner condition and for
consistency.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 boot/opensbi/opensbi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk
index 8e055633a8..01f0c3ad40 100644
--- a/boot/opensbi/opensbi.mk
+++ b/boot/opensbi/opensbi.mk
@@ -6,7 +6,7 @@
 
 OPENSBI_VERSION = $(call qstrip,$(BR2_TARGET_OPENSBI_VERSION))
 
-ifeq ($(OPENSBI_VERSION),custom)
+ifeq ($(BR2_TARGET_OPENSBI_CUSTOM_TARBALL),y)
 # Handle custom OpenSBI tarballs as specified by the configuration
 OPENSBI_TARBALL = $(call qstrip,$(BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION))
 OPENSBI_SITE = $(patsubst %/,%,$(dir $(OPENSBI_TARBALL)))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management
  2022-06-23 14:00 [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management Kory Maincent via buildroot
                   ` (2 preceding siblings ...)
  2022-06-23 14:00 ` [Buildroot] [PATCH 4/4] boot/opensbi: " Kory Maincent via buildroot
@ 2022-07-23 20:12 ` Yann E. MORIN
  3 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2022-07-23 20:12 UTC (permalink / raw)
  To: kory.maincent; +Cc: thomas.petazzoni, Sergey Matyukevich, buildroot

Köry, All,

On 2022-06-23 16:00 +0200, Kory Maincent via buildroot spake thusly:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> This patch updates the condition to handle custom tarballs as specified by
> the configuration. This change is made to have cleaner condition and for
> consistency.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>

Series of 4 patches applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> 
> Notes:
>     This patch is based on this other one:
>     https://lists.buildroot.org/pipermail/buildroot/2022-June/645216.html
> 
>  boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> index 965b1a2eb5..421d8c770d 100644
> --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> @@ -6,7 +6,7 @@
>  
>  ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
>  
> -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
> +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y)
>  # Handle custom ATF tarballs as specified by the configuration
>  ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))
>  ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL)))
> @@ -190,7 +190,7 @@ endef
>  # Configuration check
>  ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy)
>  
> -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
> +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y)
>  ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)),)
>  $(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)
>  endif
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-07-23 20:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-23 14:00 [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: update condition for custom tarball management Kory Maincent via buildroot
2022-06-23 14:00 ` [Buildroot] [PATCH 2/4] boot/u-boot: " Kory Maincent via buildroot
2022-06-23 14:00 ` [Buildroot] [PATCH 3/4] boot/barebox: " Kory Maincent via buildroot
2022-06-23 14:00 ` [Buildroot] [PATCH 4/4] boot/opensbi: " Kory Maincent via buildroot
2022-07-23 20:12 ` [Buildroot] [PATCH 1/4] boot/arm-trusted-firmware: " Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox