linux: bump default to version 4.15.15

[coffee/buildroot.git] / linux / Config.in

diff --git a/linux/Config.in b/linux/Config.in
index 115247f653bbdb4c17c01463e4d920fb8463109d..934142c53593dbd45efa5447ea8b21dbe086bc85 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -29,7 +29,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
        bool "Latest version (4.15)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-       bool "Latest CIP SLTS version (v4.4.105-cip15)"
+       bool "Latest CIP SLTS version (v4.4.112-cip18)"
        help
          CIP launched in the spring of 2016 to address the needs of
          organizations in industries such as power generation and
@@ -116,8 +116,8 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
        string
-       default "4.15" if BR2_LINUX_KERNEL_LATEST_VERSION
-       default "v4.4.105-cip15" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+       default "4.15.15" if BR2_LINUX_KERNEL_LATEST_VERSION
+       default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
        default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
                if BR2_LINUX_KERNEL_CUSTOM_VERSION
        default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
@@ -284,7 +284,7 @@ endchoice
 choice
        prompt "Kernel compression format"
        help
-         This selection will just ensure that the correct host tools are build.
+         This selection will just ensure that the correct host tools are built.
          The actual compression for the kernel should be selected in the
          kernel configuration menu.
 
@@ -363,40 +363,19 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 config BR2_LINUX_KERNEL_APPENDED_DTB
        bool
 
-choice
-       prompt "Device tree source"
-       default BR2_LINUX_KERNEL_USE_INTREE_DTS
-
-config BR2_LINUX_KERNEL_USE_INTREE_DTS
-       bool "Use a device tree present in the kernel"
-       help
-         Use a device tree source distributed with
-         the kernel sources. The dts files are located
-         in the arch/<arch>/boot/dts folder.
-
-config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
-       bool "Use a custom device tree file"
-       help
-         Use a custom device tree file, i.e, a device
-         tree file that does not belong to the kernel
-         source tree.
-endchoice
-
 config BR2_LINUX_KERNEL_INTREE_DTS_NAME
-       string "Device Tree Source file names"
-       depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
+       string "In-tree Device Tree Source file names"
        help
-         Name of the device tree source file, without
+         Name of in-tree device tree source file, without
          the trailing .dts. You can provide a list of
          dts files to build, separated by spaces.
 
 config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
-       string "Device Tree Source file paths"
-       depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS
+       string "Out-of-tree Device Tree Source file paths"
        help
-         Path to the device tree source files. You can
-         provide a list of dts paths to copy and build,
-         separated by spaces.
+         Path to to out-of-tree device tree source files.
+         You can provide a list of dts paths to copy and
+         build, separated by spaces.
 
 endif
 
@@ -412,6 +391,32 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
          /boot if DTBs have been generated by the kernel build
          process.
 
+config BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL
+       bool "Needs host OpenSSL"
+       help
+         Some Linux kernel configuration options (such as
+         CONFIG_SYSTEM_TRUSTED_KEYRING) require building a host
+         program called extract-cert, which itself needs
+         OpenSSL. Enabling this option will ensure host-openssl gets
+         built before the Linux kernel.
+
+         Enable this option if you get a Linux kernel build failure
+         such as "scripts/extract-cert.c:21:25: fatal error:
+         openssl/bio.h: No such file or directory".
+
+config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF
+       bool "Needs host libelf"
+       help
+         Some Linux kernel configuration options (such as
+         CONFIG_UNWINDER_ORC) require building a host program that
+         needs libelf. Enabling this option will ensure host-elfutils
+         (which provides libelf) gets built before the Linux kernel.
+
+         Enable this option if you get a Linux kernel build failure
+         such as "Cannot generate ORC metadata for
+         CONFIG_UNWINDER_ORC=y, please install libelf-dev,
+         libelf-devel or elfutils-libelf-devel".
+
 # Linux extensions
 source "linux/Config.ext.in"