From 898b794faa054e9058d3ea6d7b490f5603c1e3af Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 22 May 2024 21:46:10 +0200 Subject: [PATCH] configs/amarula_vyasa_rk3288_defconfig: bump to Linux version 6.1.91 Build fails with gcc 13 with: drivers/ata/libahci.c: In function 'ahci_led_store': ././include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) 357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) As explained in Linux commit[0] that fixes the build, sizeof() of enum like '(1<<31)' translate to a 64-bit type, but we expect a 32-bit type. So commit[0] makes sure the data type to be 32-bits wide by using BIT() macro. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6865596548 [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=97e28deab8bfe70d5687650f94484f8f9101e566 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- configs/amarula_vyasa_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index 7976537225..0dd47f498f 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.91" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000"