From 34a488ba7b5bb8c492f1d0918c505629fb99ad50 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sun, 16 Feb 2025 11:34:35 -0400 Subject: [PATCH] configs/friendlyarm_nanopi_r2s: update BSP versions - Switch to Linux LTS release 6.12.13 - Switch to U-Boot 2024.10 - Switch to ATF 2.12 - Add BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS option required to build U-Boot - Also fixes multiple occurrences of this issue: https://gitlab.com/buildroot.org/buildroot/-/jobs/9122556338 Signed-off-by: Gilles Talis [Julien: add missing BR2_TARGET_UBOOT_NEEDS_GNUTLS=y] Signed-off-by: Julien Olivain --- configs/friendlyarm_nanopi_r2s_defconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index c190de35f8..547d9d5f59 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" @@ -19,18 +19,20 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" 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.12" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=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.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y