diff mbox series

support/testing: sync TestATFAllwinner with orangepi_zero_plus2_defconfig

Message ID 20240410221806.89203-2-romain.naour@smile.fr
State Accepted
Headers show
Series support/testing: sync TestATFAllwinner with orangepi_zero_plus2_defconfig | expand

Commit Message

Romain Naour April 10, 2024, 10:18 p.m. UTC
u-boot-2021.04 seems to be broken when pylibfdt support is enabled
and the latest python3/setuptools are used.

Since the TestATFAllwinner is using bananapi_m64 as u-boot defconfig
but the Buildroot defconfig of this board was removed in 2022.11 [1]
update TestATFAllwinner to use a newer BSP. Use the one provided
by orangepi_zero_plus2_defconfig.

[1] daf3c6661f823e566b6310042884c36c1d73f1de

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656317 (TestATFAllwinner)

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
 support/testing/tests/boot/test_atf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Yann E. MORIN April 11, 2024, 4:36 a.m. UTC | #1
Romain, All,

On 2024-04-11 00:18 +0200, Romain Naour spake thusly:
> u-boot-2021.04 seems to be broken when pylibfdt support is enabled
> and the latest python3/setuptools are used.
> 
> Since the TestATFAllwinner is using bananapi_m64 as u-boot defconfig
> but the Buildroot defconfig of this board was removed in 2022.11 [1]
> update TestATFAllwinner to use a newer BSP. Use the one provided
> by orangepi_zero_plus2_defconfig.
> 
> [1] daf3c6661f823e566b6310042884c36c1d73f1de
> 
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656317 (TestATFAllwinner)
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  support/testing/tests/boot/test_atf.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py
> index 4fcb9b241c..1995f83a54 100644
> --- a/support/testing/tests/boot/test_atf.py
> +++ b/support/testing/tests/boot/test_atf.py
> @@ -34,15 +34,15 @@ class TestATFAllwinner(infra.basetest.BRTest):
>          BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
>          BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>          BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> -        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
> +        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
>          BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
>          # BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set
>          BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
>          BR2_TARGET_UBOOT=y
>          BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>          BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
> -        BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
> +        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
> +        BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
>          BR2_TARGET_UBOOT_NEEDS_DTC=y
>          BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
>          BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> -- 
> 2.44.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py
index 4fcb9b241c..1995f83a54 100644
--- a/support/testing/tests/boot/test_atf.py
+++ b/support/testing/tests/boot/test_atf.py
@@ -34,15 +34,15 @@  class TestATFAllwinner(infra.basetest.BRTest):
         BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
         BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
         BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9"
         BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
         # BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set
         BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
         BR2_TARGET_UBOOT=y
         BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
         BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
-        BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
+        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
+        BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
         BR2_TARGET_UBOOT_NEEDS_DTC=y
         BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
         BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y