linux: bump default to version 4.14.5

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

diff --git a/linux/Config.in b/linux/Config.in
index fd6b4b3d49695d7766a7139a063d0790b623d866..7a5f992ed54b62b2fd263e81581baaf835482c21 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -26,7 +26,26 @@ choice
        prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-       bool "Latest version (4.7.3)"
+       bool "Latest version (4.14)"
+
+config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+       bool "Latest CIP SLTS version (v4.4.98-cip13)"
+       help
+         CIP launched in the spring of 2016 to address the needs of
+         organizations in industries such as power generation and
+         distribution, water, oil and gas, transportation, building
+         automation and more for reliable and secure Linux-based
+         embedded systems that can be sustained over a period of
+         10 to as many as 60 years.
+         The project's goal is to provide an open source base layer
+         of industrial-grade software that permits the use and
+         implementation of software building blocks that meet
+         these requirements.
+
+         The CIP community plans to maintain 4.4 for security and
+         bug fixes for more than 10 years.
+
+         https://www.cip-project.org
 
 config BR2_LINUX_KERNEL_CUSTOM_VERSION
        bool "Custom version"
@@ -97,7 +116,8 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
        string
-       default "4.7.3" if BR2_LINUX_KERNEL_LATEST_VERSION
+       default "4.14.5" if BR2_LINUX_KERNEL_LATEST_VERSION
+       default "v4.4.98-cip13" 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
@@ -110,7 +130,6 @@ config BR2_LINUX_KERNEL_VERSION
 
 config BR2_LINUX_KERNEL_PATCH
        string "Custom kernel patches"
-       depends on !BR2_LINUX_KERNEL_CUSTOM_LOCAL
        help
          A space-separated list of patches to apply to the
          kernel. Each patch can be described as an URL, a local file
@@ -168,9 +187,6 @@ config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES
 # Binary format
 #
 
-config BR2_LINUX_KERNEL_UBOOT_IMAGE
-       bool
-
 choice
        prompt "Kernel binary format"
        default BR2_LINUX_KERNEL_ZIMAGE if BR2_arm || BR2_armeb
@@ -180,15 +196,15 @@ config BR2_LINUX_KERNEL_UIMAGE
        depends on BR2_arc || BR2_arm || BR2_armeb || BR2_bfin || \
                   BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
                   BR2_sh || BR2_mips || BR2_mipsel || \
-                  BR2_mips64 || BR2_mips64el
-       select BR2_LINUX_KERNEL_UBOOT_IMAGE
+                  BR2_mips64 || BR2_mips64el || BR2_xtensa
+       select BR2_PACKAGE_HOST_UBOOT_TOOLS
 
 config BR2_LINUX_KERNEL_APPENDED_UIMAGE
        bool "uImage with appended DT"
        depends on BR2_arm || BR2_armeb
        select BR2_LINUX_KERNEL_DTS_SUPPORT
        select BR2_LINUX_KERNEL_APPENDED_DTB
-       select BR2_LINUX_KERNEL_UBOOT_IMAGE
+       select BR2_PACKAGE_HOST_UBOOT_TOOLS
 
 config BR2_LINUX_KERNEL_BZIMAGE
        bool "bzImage"
@@ -213,14 +229,14 @@ config BR2_LINUX_KERNEL_APPENDED_ZIMAGE
 config BR2_LINUX_KERNEL_CUIMAGE
        bool "cuImage"
        depends on BR2_powerpc
-       select BR2_LINUX_KERNEL_UBOOT_IMAGE
+       select BR2_PACKAGE_HOST_UBOOT_TOOLS
        select BR2_LINUX_KERNEL_DTS_SUPPORT
        select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 
 config BR2_LINUX_KERNEL_SIMPLEIMAGE
        bool "simpleImage"
        depends on BR2_microblaze
-       select BR2_LINUX_KERNEL_UBOOT_IMAGE
+       select BR2_PACKAGE_HOST_UBOOT_TOOLS
        select BR2_LINUX_KERNEL_DTS_SUPPORT
        select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 
@@ -231,7 +247,7 @@ config BR2_LINUX_KERNEL_IMAGE
 config BR2_LINUX_KERNEL_LINUX_BIN
        bool "linux.bin"
        depends on BR2_microblaze
-       select BR2_LINUX_KERNEL_UBOOT_IMAGE
+       select BR2_PACKAGE_HOST_UBOOT_TOOLS
 
 config BR2_LINUX_KERNEL_VMLINUX_BIN
        bool "vmlinux.bin"
@@ -352,7 +368,7 @@ choice
        default BR2_LINUX_KERNEL_USE_INTREE_DTS
 
 config BR2_LINUX_KERNEL_USE_INTREE_DTS
-       bool "Use a device tree present in the kernel."
+       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
@@ -400,7 +416,7 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
 source "linux/Config.ext.in"
 
 # Linux tools
-source "linux/Config.tools.in"
+source "package/linux-tools/Config.in"
 
 endif # BR2_LINUX_KERNEL