From db951a4c712930c2fde893d2d56ee5e3f9318911 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Aug 2025 23:18:02 +0200 Subject: [PATCH] configs/sipeed_licheepi_zero: update Linux, U-Boot to fix build Since Buildroot commit [1] dc0f7215c6 "package/gcc: switch to 13.x as default", sipeed_licheepi_zero_defconfig fails when building the Linux kernel with the error message: drivers/ata/libahci.c: In function 'ahci_led_store': ./include/linux/compiler.h:350:45: error: call to '__compiletime_assert_1138' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) 350 | _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) This issue is fixed by upstream Kernel commit [2]. This commit fixes this issue by updating the Linux Kernel from v5.3.5 (which is not a LTS series) to v6.12.43 (which is a LTS series including the fixes). With this update, BR2_LINUX_KERNEL_INTREE_DTS_NAME is updated accordingly to follow the new DTS organization. This commit also updates U-Boot from 2022.01 to 2025.07. This new version now requires BR2_TARGET_UBOOT_NEEDS_GNUTLS=y. While at it, this commit also switches to a stable glibc Bootlin external toolchain, to follow the new guidelines from [3]. Finally, this commit adds BR2_DOWNLOAD_FORCE_CHECK_HASHES=y and the corresponding hash files. The .checkpackageignore is also updated to reflect that change. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/11026771001 [1] https://gitlab.com/buildroot.org/buildroot/-/commit/dc0f7215c604e845009e03784a221332867bf35a [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f07788079f515ca4a681c5f595bdad19cfbd7b1d [3] https://elinux.org/Buildroot:DeveloperDaysELCE2024#Rules_for_defconfigs Cc: Michel Stempin Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - board/sipeed/licheepi_zero/patches/linux/linux.hash | 2 ++ board/sipeed/licheepi_zero/patches/uboot/uboot.hash | 2 ++ configs/sipeed_licheepi_zero_defconfig | 13 +++++++++---- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 board/sipeed/licheepi_zero/patches/linux/linux.hash create mode 100644 board/sipeed/licheepi_zero/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 11c8a23763..f1c1527e31 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -178,7 +178,6 @@ configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_dock_defconfig lib_defconfig.ForceCheckHash configs/sipeed_licheepi_nano_defconfig lib_defconfig.ForceCheckHash -configs/sipeed_licheepi_zero_defconfig lib_defconfig.ForceCheckHash configs/sipeed_maix_bit_defconfig lib_defconfig.ForceCheckHash configs/sipeed_maix_bit_sdcard_defconfig lib_defconfig.ForceCheckHash configs/sipeed_maix_dock_defconfig lib_defconfig.ForceCheckHash diff --git a/board/sipeed/licheepi_zero/patches/linux/linux.hash b/board/sipeed/licheepi_zero/patches/linux/linux.hash new file mode 100644 index 0000000000..216d9b9d39 --- /dev/null +++ b/board/sipeed/licheepi_zero/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 0fcbbbbcd456e87bbbfc8bf37af541fda62ccfcce76903503424fd101ef7bdee linux-6.12.43.tar.xz diff --git a/board/sipeed/licheepi_zero/patches/uboot/uboot.hash b/board/sipeed/licheepi_zero/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/sipeed/licheepi_zero/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/configs/sipeed_licheepi_zero_defconfig b/configs/sipeed_licheepi_zero_defconfig index e92c1d854e..0c60a5c763 100644 --- a/configs/sipeed_licheepi_zero_defconfig +++ b/configs/sipeed_licheepi_zero_defconfig @@ -1,7 +1,11 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/sipeed/licheepi_zero/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -10,10 +14,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/licheepi_zero/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.43" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-v3s-licheepi-zero allwinner/sun8i-v3s-licheepi-zero-dock" BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_WPA_SUPPLICANT=y @@ -23,11 +27,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="LicheePi_Zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y