{linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series

[buildroot-mgba.git] / linux / Config.in

diff --git a/linux/Config.in b/linux/Config.in
index 0f677d1e4e3804160a7ba47b5bc3a10155e22b18..f076ef5b5e97bc1d42e90ec5ba7e06322caa925c 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -28,10 +28,12 @@ choice
        prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-       bool "Latest version (5.15)"
+       bool "Latest version (6.6)"
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 if BR2_KERNEL_HEADERS_AS_KERNEL
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-       bool "Latest CIP SLTS version (4.19.198-cip54)"
+       bool "Latest CIP SLTS version (5.10.162-cip24)"
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL
        help
          CIP launched in the spring of 2016 to address the needs of
          organizations in industries such as power generation and
@@ -44,18 +46,19 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
          implementation of software building blocks that meet
          these requirements.
 
-         The CIP community plans to maintain 4.19 for security and
+         The CIP community plans to maintain 5.10 for security and
          bug fixes for more than 10 years.
 
          https://www.cip-project.org
 
 config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
-       bool "Latest CIP RT SLTS version (4.19.198-cip54-rt21)"
+       bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)"
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL
        help
          Same as the CIP version, but this is the PREEMPT_RT realtime
          variant.
 
-         The CIP community plans to maintain 4.19 for security and
+         The CIP community plans to maintain 5.10 for security and
          bug fixes for more than 10 years.
 
          https://www.cip-project.org
@@ -125,9 +128,9 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
        string
-       default "5.15" if BR2_LINUX_KERNEL_LATEST_VERSION
-       default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-       default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
+       default "6.6.7" if BR2_LINUX_KERNEL_LATEST_VERSION
+       default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+       default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
        default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
                if BR2_LINUX_KERNEL_CUSTOM_VERSION
        default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
@@ -261,11 +264,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE
 
 config BR2_LINUX_KERNEL_IMAGE
        bool "Image"
-       depends on BR2_aarch64 || BR2_riscv
+       depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv
 
 config BR2_LINUX_KERNEL_IMAGEGZ
        bool "Image.gz"
-       depends on BR2_aarch64 || BR2_riscv
+       depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv
 
 config BR2_LINUX_KERNEL_LINUX_BIN
        bool "linux.bin"
@@ -411,9 +414,10 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME
 config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
        string "Out-of-tree Device Tree Source file paths"
        help
-         Path to the out-of-tree device tree source files.
-         You can provide a list of dts paths to copy and
-         build, separated by spaces.
+         Paths to out-of-tree Device Tree Source (.dts) and Device Tree
+         Source Include (.dtsi) files, separated by spaces. These files
+         will be copied to the kernel sources and the .dts files will
+         be compiled from there.
 
 config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME
        bool "Keep the directory name of the Device Tree"
@@ -470,6 +474,18 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF
          CONFIG_UNWINDER_ORC=y, please install libelf-dev,
          libelf-devel or elfutils-libelf-devel".
 
+config BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE
+       bool "Needs host pahole"
+       help
+         Some Linux kernel configuration options (such as
+         CONFIG_DEBUG_INFO_BTF) require building a host program
+         called pahole. Enabling this option will ensure host-pahole
+         gets built before the Linux kernel.
+
+         Enable this option if you get a Linux kernel build failure
+         such as "BTF: .tmp_vmlinux.btf: pahole (pahole) is not
+         available".
+
 # Linux extensions
 source "linux/Config.ext.in"