| Message ID | 20220129111731.736265-2-peron.clem@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] configs/beelink_gs1: increase rootfs size to 120M | expand |
Hi Clément, > Il giorno 29 gen 2022, alle ore 12:18, Clément Péron <peron.clem@gmail.com> ha scritto: > > 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> Best regards Giulio > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig > index 1872aabdf0..ca953df3ea 100644 > --- a/configs/beelink_gs1_defconfig > +++ b/configs/beelink_gs1_defconfig > @@ -11,11 +11,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" > @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # 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 > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
On Sat, 29 Jan 2022 12:17:31 +0100 Clément Péron <peron.clem@gmail.com> wrote: > 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> > --- > configs/beelink_gs1_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas
diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index 1872aabdf0..ca953df3ea 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -11,11 +11,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" @@ -29,14 +29,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # 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
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> --- configs/beelink_gs1_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)