[Buildroot] [PATCH] boot/arm-trusted-firmware: bump to v2.12

[Buildroot] [PATCH] boot/arm-trusted-firmware: bump to v2.12

[Vincent Stehlé]

Update trusted-firmware-a version to v2.12 and add a hash file accordingly.

Compared to v2.11, the license has changed with the additional mention of
files from the pydevicetree project under Apache 2.0 license.
As we only document the main license of TF-A, BSD-3-Clause, this change has
no impact for us.

Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Dick Olsson <hi@senzilla.io>
Cc: Sergey Matyukevich <geomatsi@gmail.com>
---

Hi,

After doing some testing, I think it is safe to bump our default version of
TF-A to v2.12.

Tested ok with the following python tests (modified locally to use TF-A
v2.12):
- tests.boot.test_atf.TestATFAllwinner (note: this test is build only)
- tests.boot.test_edk2.TestEdk2
- tests.boot.test_optee_os.TestOptee
- tests.package.test_fwts.TestFwts

Boot-tested ok with the following defconfigs (modified locally to use TF-A
v2.12):
- arm_fvp_ebbr
- qemu_aarch64_ebbr
- qemu_aarch64_sbsa
- qemu_arm_ebbr
- qemu_arm_vexpress_tz
- rockpro64

Build-tested ok with the following defconfigs (modified locally to use TF-A
v2.12):
- imx8mn_bsh_smm_s2
- imx8mn_bsh_smm_s2_pro
- kontron_bl_imx8mm
- olimex_a64_olinuxino
- orangepi_pc2
- orangepi_zero2w
- orangepi_zero_plus
- pine64
- roc_pc_rk3399
- stm32mp157a_dk1
- stm32mp157c_dk2
- stm32mp157c_odyssey

Best regards,
Vincent.

 boot/arm-trusted-firmware/Config.in                       | 4 ++--
 boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash

diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index 4a5c7dc89c..c8deede9cd 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -14,7 +14,7 @@ choice
 	  Select the specific ATF version you want to use
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
-	bool "v2.11"
+	bool "v2.12"
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION
 	bool "latest lts-v2.10.x"
@@ -52,7 +52,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
-	default "v2.11"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
+	default "v2.12"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "lts-v2.10.5"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION
 	default "lts-v2.8.20"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
diff --git a/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash
new file mode 100644
index 0000000000..55ea515481
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219  arm-trusted-firmware-v2.12-git4.tar.gz
+sha256  b2c79635797bafcde84c6edadadde290b9d5e05deb3ea16a847210fd2ca83669  docs/license.rst
-- 
2.45.2

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

Re: [Buildroot] [PATCH] boot/arm-trusted-firmware: bump to v2.12

[Julien Olivain]

Hi Vincent,

On 16/12/2024 10:04, Vincent Stehlé wrote:
> Update trusted-firmware-a version to v2.12 and add a hash file 
> accordingly.
> 
> Compared to v2.11, the license has changed with the additional mention 
> of
> files from the pydevicetree project under Apache 2.0 license.
> As we only document the main license of TF-A, BSD-3-Clause, this change 
> has
> no impact for us.
> 
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Dick Olsson <hi@senzilla.io>
> Cc: Sergey Matyukevich <geomatsi@gmail.com>

Thanks for the patch (and the extended testing). I applied to master.

I removed the hash file for v2.11, since it is no longer needed
here. I also see that arm_fvp_ebbr_defconfig uses TF-A v2.11 [1]
but its patch directory [2] does not include an entry for it.
I believe it was missing and was using the hash file I removed.
This defconfig might be broken now. Could you double check that
please? You might need to add back a hash file in your board
patch directory (even if it's for an updated v2.12 version).

Best regards,

Julien.

[1] 
https://gitlab.com/buildroot.org/buildroot/-/blob/master/configs/arm_fvp_ebbr_defconfig#L20
[2] 
https://gitlab.com/buildroot.org/buildroot/-/tree/master/board/arm/fvp-ebbr/patches


> ---
> 
> Hi,
> 
> After doing some testing, I think it is safe to bump our default 
> version of
> TF-A to v2.12.
> 
> Tested ok with the following python tests (modified locally to use TF-A
> v2.12):
> - tests.boot.test_atf.TestATFAllwinner (note: this test is build only)
> - tests.boot.test_edk2.TestEdk2
> - tests.boot.test_optee_os.TestOptee
> - tests.package.test_fwts.TestFwts
> 
> Boot-tested ok with the following defconfigs (modified locally to use 
> TF-A
> v2.12):
> - arm_fvp_ebbr
> - qemu_aarch64_ebbr
> - qemu_aarch64_sbsa
> - qemu_arm_ebbr
> - qemu_arm_vexpress_tz
> - rockpro64
> 
> Build-tested ok with the following defconfigs (modified locally to use 
> TF-A
> v2.12):
> - imx8mn_bsh_smm_s2
> - imx8mn_bsh_smm_s2_pro
> - kontron_bl_imx8mm
> - olimex_a64_olinuxino
> - orangepi_pc2
> - orangepi_zero2w
> - orangepi_zero_plus
> - pine64
> - roc_pc_rk3399
> - stm32mp157a_dk1
> - stm32mp157c_dk2
> - stm32mp157c_odyssey
> 
> Best regards,
> Vincent.
> 
>  boot/arm-trusted-firmware/Config.in                       | 4 ++--
>  boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash | 3 +++
>  2 files changed, 5 insertions(+), 2 deletions(-)
>  create mode 100644 
> boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash
> 
> diff --git a/boot/arm-trusted-firmware/Config.in 
> b/boot/arm-trusted-firmware/Config.in
> index 4a5c7dc89c..c8deede9cd 100644
> --- a/boot/arm-trusted-firmware/Config.in
> +++ b/boot/arm-trusted-firmware/Config.in
> @@ -14,7 +14,7 @@ choice
>  	  Select the specific ATF version you want to use
> 
>  config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
> -	bool "v2.11"
> +	bool "v2.12"
> 
>  config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION
>  	bool "latest lts-v2.10.x"
> @@ -52,7 +52,7 @@ config 
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE
> 
>  config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
>  	string
> -	default "v2.11"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
> +	default "v2.12"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
>  	default "lts-v2.10.5"	if 
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION
>  	default "lts-v2.8.20"	if 
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION
>  	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
> diff --git a/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash 
> b/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash
> new file mode 100644
> index 0000000000..55ea515481
> --- /dev/null
> +++ b/boot/arm-trusted-firmware/v2.12/arm-trusted-firmware.hash
> @@ -0,0 +1,3 @@
> +# Locally calculated
> +sha256  
> 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219  
> arm-trusted-firmware-v2.12-git4.tar.gz
> +sha256  
> b2c79635797bafcde84c6edadadde290b9d5e05deb3ea16a847210fd2ca83669  
> docs/license.rst
> --
> 2.45.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] boot/arm-trusted-firmware: bump to v2.12

[Vincent Stehlé]

On Mon, Dec 16, 2024 at 10:08:46PM +0100, Julien Olivain wrote:
> Hi Vincent,
> 
> On 16/12/2024 10:04, Vincent Stehlé wrote:
> > Update trusted-firmware-a version to v2.12 and add a hash file
> > accordingly.
> > 
> > Compared to v2.11, the license has changed with the additional mention
> > of
> > files from the pydevicetree project under Apache 2.0 license.
> > As we only document the main license of TF-A, BSD-3-Clause, this change
> > has
> > no impact for us.
> > 
> > Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> > Cc: Dick Olsson <hi@senzilla.io>
> > Cc: Sergey Matyukevich <geomatsi@gmail.com>
> 
> Thanks for the patch (and the extended testing). I applied to master.

Hi Julien,

Thanks for handling that.

> I removed the hash file for v2.11, since it is no longer needed
> here. I also see that arm_fvp_ebbr_defconfig uses TF-A v2.11 [1]
> but its patch directory [2] does not include an entry for it.
> I believe it was missing and was using the hash file I removed.
> This defconfig might be broken now. Could you double check that
> please? You might need to add back a hash file in your board
> patch directory (even if it's for an updated v2.12 version).

Thanks for pointing that out!

I see not one but two defconfigs using TF-A v2.11 without a
corresponding hash file now:

  arm_fvp_ebbr_defconfig
  rockpro64_defconfig

I will send patches to add hash files to both soon.

Fortunately I think there is no urgency, as with those defconfigs TF-A
does indeed still extract fine and all we get for now is a warning:

  WARNING: no hash file for arm-trusted-firmware-v2.11-git4.tar.gz

This is arguably a bit of a surprising behaviour when we have
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y...

Best regards,
Vincent.

> 
> Best regards,
> 
> Julien.
> 
> [1] https://gitlab.com/buildroot.org/buildroot/-/blob/master/configs/arm_fvp_ebbr_defconfig#L20
> [2] https://gitlab.com/buildroot.org/buildroot/-/tree/master/board/arm/fvp-ebbr/patches
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] boot/arm-trusted-firmware: bump to v2.12

[Julien Olivain]

Hi Vincent,

On 17/12/2024 11:04, Vincent Stehlé wrote:
> On Mon, Dec 16, 2024 at 10:08:46PM +0100, Julien Olivain wrote:
>> Hi Vincent,
>> 
>> On 16/12/2024 10:04, Vincent Stehlé wrote:
>> > Update trusted-firmware-a version to v2.12 and add a hash file
>> > accordingly.
>> >
>> > Compared to v2.11, the license has changed with the additional mention
>> > of
>> > files from the pydevicetree project under Apache 2.0 license.
>> > As we only document the main license of TF-A, BSD-3-Clause, this change
>> > has
>> > no impact for us.
>> >
>> > Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
>> > Cc: Dick Olsson <hi@senzilla.io>
>> > Cc: Sergey Matyukevich <geomatsi@gmail.com>
>> 
>> Thanks for the patch (and the extended testing). I applied to master.
> 
> Hi Julien,
> 
> Thanks for handling that.
> 
>> I removed the hash file for v2.11, since it is no longer needed
>> here. I also see that arm_fvp_ebbr_defconfig uses TF-A v2.11 [1]
>> but its patch directory [2] does not include an entry for it.
>> I believe it was missing and was using the hash file I removed.
>> This defconfig might be broken now. Could you double check that
>> please? You might need to add back a hash file in your board
>> patch directory (even if it's for an updated v2.12 version).
> 
> Thanks for pointing that out!
> 
> I see not one but two defconfigs using TF-A v2.11 without a
> corresponding hash file now:
> 
>   arm_fvp_ebbr_defconfig
>   rockpro64_defconfig
> 
> I will send patches to add hash files to both soon.
> 
> Fortunately I think there is no urgency, as with those defconfigs TF-A
> does indeed still extract fine and all we get for now is a warning:
> 
>   WARNING: no hash file for arm-trusted-firmware-v2.11-git4.tar.gz
> 
> This is arguably a bit of a surprising behaviour when we have
> BR2_DOWNLOAD_FORCE_CHECK_HASHES=y...

I agree, this behavior is surprising. It is a corner case of the
check-hash script and arm-trusted-firmware which is the only package
defining separate hash files, per package version.

We'll see how we can improve that specific point.

> Best regards,
> Vincent.
> 
>> 
>> Best regards,
>> 
>> Julien.
>> 
>> [1] 
>> https://gitlab.com/buildroot.org/buildroot/-/blob/master/configs/arm_fvp_ebbr_defconfig#L20
>> [2] 
>> https://gitlab.com/buildroot.org/buildroot/-/tree/master/board/arm/fvp-ebbr/patches

Thanks for double checking!

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