summaryrefslogtreecommitdiffstats
path: root/linux/Config.in
diff options
context:
space:
mode:
Diffstat (limited to 'linux/Config.in')
-rw-r--r--linux/Config.in63
1 files changed, 34 insertions, 29 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 5afd620d98..142d42e10c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -116,7 +116,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "4.15.7" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "4.15.16" 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
@@ -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"
OpenPOWER on IntegriCloud