Accueil Explorer Aide
S'inscrire Connexion
PUBLIC_REPOS
/
buildroot
miroir de git://git.buildroot.net/buildroot
2
1
Fork 0
Fichiers
Parcourir la source

configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10

U-boot libfdt fails to compile on CI.
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status

https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478208

As this fix has been already upstreamed just bump U-boot package.

Let's also bump Kernel and ATF as the board is properly supported upstream.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Clément Péron il y a 3 ans
Parent
7bc68d9b10
commit
87ee52a205
1 fichiers modifiés avec 5 ajouts et 5 suppressions
Vue séparée Afficher les stats Diff
  1. 5 5
      configs/beelink_gs1_defconfig

+ 5 - 5
configs/beelink_gs1_defconfig
Voir le fichier 

@@ -9,11 +9,11 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh"
 
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg"
 
 
-# Kernel Linux headers same as kernel, a 5.5 series
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5=y
 
+# Kernel Linux headers same as kernel, 5.15 series
 
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 
 BR2_LINUX_KERNEL=y
 
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.4"
 
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15"
 
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1"
 
@@ -24,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 
 # Firmware
 
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
 
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2"
 
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
 
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6"
 
 
 # Bootloader
 
 BR2_TARGET_UBOOT=y
 
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01"
 
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
 
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1"
 
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y