diff mbox series

[RESEND,v2,02/11] boot/uboot: bump to version v2024.04

Message ID 20240430-optee-update-v2-2-5bdc2f940db1@ti.com
State Accepted
Headers show
Series update bsp binaries for TI SoCs | expand

Commit Message

Bryan Brattlof May 2, 2024, 4:26 p.m. UTC
Update to the latest tagged release of U-Boot

Signed-off-by: Bryan Brattlof <bb@ti.com>
---
 boot/uboot/Config.in  | 6 +++---
 boot/uboot/uboot.hash | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Andreas Dannenberg May 6, 2024, 8:53 a.m. UTC | #1
Hi Bryan,

On Thu, May 02, 2024 at 11:26:52AM -0500, Bryan Brattlof via buildroot wrote:
> Update to the latest tagged release of U-Boot
> 
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
>  boot/uboot/Config.in  | 6 +++---
>  boot/uboot/uboot.hash | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 8d2228dc7dd45..00d3f3bfbbfdd 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -41,7 +41,7 @@ choice
>  	  Select the specific U-Boot version you want to use
>  
>  config BR2_TARGET_UBOOT_LATEST_VERSION
> -	bool "2024.01"
> +	bool "2024.04"

Similar to your other patch ("boot/optee-os: bump to release v4.2.0")
changing the global default will affect other platforms so there's some
risk for breakage I suppose. Why not keeping those specific changes to
the AM62/AM64 platforms?

--
Andreas Dannenberg
Texas Instruments Inc


>  
>  config BR2_TARGET_UBOOT_CUSTOM_VERSION
>  	bool "Custom version"
> @@ -85,7 +85,7 @@ endif
>  
>  config BR2_TARGET_UBOOT_VERSION
>  	string
> -	default "2024.01"	if BR2_TARGET_UBOOT_LATEST_VERSION
> +	default "2024.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
>  	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
>  		if BR2_TARGET_UBOOT_CUSTOM_VERSION
>  	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
> @@ -291,7 +291,7 @@ config BR2_TARGET_UBOOT_USE_BINMAN
>  	help
>  	  Use binman tool for generation and signing of boot images.
>  
> -	  https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
> +	  https://docs.u-boot.org/en/v2024.04/develop/package/binman.html
>  
>  menu "U-Boot binary format"
>  
> diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
> index fbe5d215409d2..a8021fb696b1a 100644
> --- a/boot/uboot/uboot.hash
> +++ b/boot/uboot/uboot.hash
> @@ -1,3 +1,3 @@
>  # Locally computed:
> -sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
> +sha256  18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a  u-boot-2024.04.tar.bz2
>  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
> 
> -- 
> 2.43.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Bryan Brattlof May 6, 2024, 2:45 p.m. UTC | #2
On May  6, 2024 thus sayeth Andreas Dannenberg via buildroot:
> Hi Bryan,
> 
> On Thu, May 02, 2024 at 11:26:52AM -0500, Bryan Brattlof via buildroot wrote:
> > Update to the latest tagged release of U-Boot
> > 
> > Signed-off-by: Bryan Brattlof <bb@ti.com>
> > ---
> >  boot/uboot/Config.in  | 6 +++---
> >  boot/uboot/uboot.hash | 2 +-
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> > index 8d2228dc7dd45..00d3f3bfbbfdd 100644
> > --- a/boot/uboot/Config.in
> > +++ b/boot/uboot/Config.in
> > @@ -41,7 +41,7 @@ choice
> >  	  Select the specific U-Boot version you want to use
> >  
> >  config BR2_TARGET_UBOOT_LATEST_VERSION
> > -	bool "2024.01"
> > +	bool "2024.04"
> 
> Similar to your other patch ("boot/optee-os: bump to release v4.2.0")
> changing the global default will affect other platforms so there's some
> risk for breakage I suppose. Why not keeping those specific changes to
> the AM62/AM64 platforms?
> 

Ha yeah I went back and forth with this. OP-TEE could use an update but 
there isn't a mechanism to cleanly select a version like we have with 
U-Boot or Linux (or I just wasn't smart enough to figure it out)

Though you are correct, having a way to specify which version a board 
wants to use would be more helpful the upgrading everyone. I'll see what 
I can come up with for OP-TEE so we can select versions for each board.

~Bryan
Thomas Petazzoni May 6, 2024, 8:09 p.m. UTC | #3
Hello Andreas,

On Mon, 6 May 2024 03:53:15 -0500
Andreas Dannenberg via buildroot <buildroot@buildroot.org> wrote:

> Similar to your other patch ("boot/optee-os: bump to release v4.2.0")
> changing the global default will affect other platforms so there's some
> risk for breakage I suppose. Why not keeping those specific changes to
> the AM62/AM64 platforms?

What Bryan did is totally fine and in line with how we handle things in
Buildroot. For packages that are close the hardware (OP-TEE, TF-A,
U-Boot, Linux), Buildroot offers:

- Using a "latest" version, which is regularly updated to the latest
  upstream version, which means that if you change Buildroot version,
  this version changes, like for any other package.

- Using a "custom" version, which is provided as an URL to a custom
  tarball, a tag/commit in a Git repo, etc. In this case, the version
  is explicitly specified in the user's .config file, and doesn't
  change when Buildroot is updated.

So, what Bryan did is update the "latest" version, and this is
perfectly correct.

All our defconfigs use a "custom" version for all of Linux, U-Boot,
OP-TEE, TF-A, specifically to ensure that despite the update in
Buildroot, our defconfig keep on using the versions that were tested by
the developer who submitted the defconfig.

Best regards,

Thomas
Andreas Dannenberg May 7, 2024, 6:17 a.m. UTC | #4
Hi Thomas,

On Mon, May 06, 2024 at 10:09:48PM +0200, Thomas Petazzoni wrote:
> Hello Andreas,
> 
> On Mon, 6 May 2024 03:53:15 -0500
> Andreas Dannenberg via buildroot <buildroot@buildroot.org> wrote:
> 
> > Similar to your other patch ("boot/optee-os: bump to release v4.2.0")
> > changing the global default will affect other platforms so there's some
> > risk for breakage I suppose. Why not keeping those specific changes to
> > the AM62/AM64 platforms?
> 
> What Bryan did is totally fine and in line with how we handle things in
> Buildroot. For packages that are close the hardware (OP-TEE, TF-A,
> U-Boot, Linux), Buildroot offers:
> 
> - Using a "latest" version, which is regularly updated to the latest
>   upstream version, which means that if you change Buildroot version,
>   this version changes, like for any other package.
> 
> - Using a "custom" version, which is provided as an URL to a custom
>   tarball, a tag/commit in a Git repo, etc. In this case, the version
>   is explicitly specified in the user's .config file, and doesn't
>   change when Buildroot is updated.
> 
> So, what Bryan did is update the "latest" version, and this is
> perfectly correct.
> 
> All our defconfigs use a "custom" version for all of Linux, U-Boot,
> OP-TEE, TF-A, specifically to ensure that despite the update in
> Buildroot, our defconfig keep on using the versions that were tested by
> the developer who submitted the defconfig.

Ah, that's the piece I wasn't fully aware of, that all of the defconfigs
use a "custom" version, very much limiting the impact of the change here.
Thanks for clarifying!

Regards,
Andreas

> Best regards,
> 
> Thomas
> -- 
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
diff mbox series

Patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8d2228dc7dd45..00d3f3bfbbfdd 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -41,7 +41,7 @@  choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2024.01"
+	bool "2024.04"
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION
 	bool "Custom version"
@@ -85,7 +85,7 @@  endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2024.01"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2024.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -291,7 +291,7 @@  config BR2_TARGET_UBOOT_USE_BINMAN
 	help
 	  Use binman tool for generation and signing of boot images.
 
-	  https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
+	  https://docs.u-boot.org/en/v2024.04/develop/package/binman.html
 
 menu "U-Boot binary format"
 
diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
index fbe5d215409d2..a8021fb696b1a 100644
--- a/boot/uboot/uboot.hash
+++ b/boot/uboot/uboot.hash
@@ -1,3 +1,3 @@ 
 # Locally computed:
-sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
+sha256  18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a  u-boot-2024.04.tar.bz2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt