From: "Clément Péron" <peron.clem@gmail.com>
To: buildroot@buildroot.org
Cc: "Clément Péron" <peron.clem@gmail.com>
Subject: [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10
Date: Sat, 29 Jan 2022 12:17:31 +0100 [thread overview]
Message-ID: <20220129111731.736265-2-peron.clem@gmail.com> (raw)
In-Reply-To: <20220129111731.736265-1-peron.clem@gmail.com>
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(-)
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
next prev parent reply other threads:[~2022-01-29 11:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-29 11:17 [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M Clément Péron
2022-01-29 11:17 ` Clément Péron [this message]
2022-01-29 11:22 ` [Buildroot] [PATCH v2 2/2] configs/beelink_gs1: bump to linux 5.15, atf 2.5 and u-boot 2021.10 Giulio Benetti
2022-01-30 17:16 ` Thomas Petazzoni via buildroot
2022-01-30 17:18 ` [Buildroot] [PATCH v2 1/2] configs/beelink_gs1: increase rootfs size to 120M Thomas Petazzoni via buildroot
2022-01-31 12:43 ` Clément Péron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220129111731.736265-2-peron.clem@gmail.com \
--to=peron.clem@gmail.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox