浏览代码

configs/mx6sx_udoo_neo: bump kernel to 6.6.43

The current 5.15.13 kernel fails to build:

  In file included from <command-line>:
  drivers/ata/libahci.c: In function 'ahci_led_store':
  ././include/linux/compiler_types.h:322:45: error: call to '__compiletime_assert_329' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)

This commit fixes this by using the opportunity to bump the kernel to
the latest LTS version. While bumping the kernel, the headers to use
are also updated, and the selected device trees are updated to use the
new dts per vendor organization.

This update does not introduce any new error or warning with the
current configuration.

Fixes:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/7477108980

Signed-off-by: Philip-Dylan Gleonec <philip-dylan@gleonec.bzh>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Philip-Dylan Gleonec 1 年之前
父节点
当前提交
44b921f605
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      configs/mx6sx_udoo_neo_defconfig

+ 4 - 4
configs/mx6sx_udoo_neo_defconfig

@@ -3,8 +3,8 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.6 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
@@ -19,10 +19,10 @@ BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-udoo-neo-basic nxp/imx/imx6sx-udoo-neo-full nxp/imx/imx6sx-udoo-neo-extended"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 # required tools to create the SD card image