Message ID | 20211106181424.299041-2-peron.clem@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | [1/2] configs/beelink_gs1: increase rootfs size to 120M | expand |
Hi Clément, On 06/11/21 19:14, Clément Péron wrote: > libfdt fails to compile with 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 > > Bump U-boot and also Kernel and ATF. the commit log and subject doesn't explain that the version bumping(as I suspect) fix the uboot build failure(as I can interpret). Can you please improve commit log by specifying that while bumping(u-boot I think) that error is fixed? And please add: Fixes: the link of the CI failure. Thank you Best regards
Hi Giulio, On Mon, 17 Jan 2022 at 19:54, Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > > Hi Clément, > > On 06/11/21 19:14, Clément Péron wrote: > > libfdt fails to compile with 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 > > > > Bump U-boot and also Kernel and ATF. > > the commit log and subject doesn't explain that the version bumping(as I > suspect) fix the uboot build failure(as I can interpret). Can you please > improve commit log by specifying that while bumping(u-boot I think) that > error is fixed? Thanks for the review, I will send a V2 Regards, Clement > > And please add: > > Fixes: > the link of the CI failure. > > Thank you > Best regards > -- > Giulio Benetti > Benetti Engineering sas > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > --- > > 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 > > >
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
libfdt fails to compile with 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 Bump U-boot and also Kernel and ATF. Signed-off-by: Clément Péron <peron.clem@gmail.com> --- configs/beelink_gs1_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)