firewall: update to latest git HEAD

[openwrt/openwrt.git] / config / Config-kernel.in

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index d8ca76cf1d96dc0ab8f2a2f60b465e62c34b776f..0cbe5e8351a5a80171c0aa6f72c4782f44a3a0be 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -26,7 +26,7 @@ config KERNEL_PRINTK
 
 config KERNEL_CRASHLOG
        bool "Crash logging"
-       depends on !(arm || powerpc || sparc || TARGET_uml)
+       depends on !(arm || powerpc || sparc || TARGET_uml || i386 || x86_64)
        default y
 
 config KERNEL_SWAP
@@ -42,15 +42,20 @@ config KERNEL_DEBUG_FS
          write to these files. Many common debugging facilities, such as
          ftrace, require the existence of debugfs.
 
+config KERNEL_MIPS_FPU_EMULATOR
+       bool "Compile the kernel with MIPS FPU Emulator"
+       default y if TARGET_pistachio
+       depends on (mips || mipsel || mips64 || mips64el)
+
 config KERNEL_ARM_PMU
        bool
        default n
-       depends on (arm || arm64)
+       depends on (arm || aarch64)
 
 config KERNEL_PERF_EVENTS
-       bool
+       bool "Compile the kernel with performance events and counters"
        default n
-       select KERNEL_ARM_PMU if (arm || arm64)
+       select KERNEL_ARM_PMU if (arm || aarch64)
 
 config KERNEL_PROFILING
        bool "Compile the kernel with profiling enabled"
@@ -170,10 +175,6 @@ config KERNEL_AIO
        bool "Compile the kernel with asynchronous IO support"
        default n
 
-config KERNEL_DIRECT_IO
-       bool "Compile the kernel with direct IO support"
-       default n
-
 config KERNEL_FHANDLE
        bool "Compile the kernel with support for fhandle syscalls"
        default n
@@ -190,6 +191,14 @@ config KERNEL_MAGIC_SYSRQ
        bool "Compile the kernel with SysRq support"
        default y
 
+config KERNEL_DEBUG_PINCTRL
+       bool "Compile the kernel with pinctrl debugging"
+       select KERNEL_DEBUG_KERNEL
+
+config KERNEL_DEBUG_GPIO
+       bool "Compile the kernel with gpio debugging"
+       select KERNEL_DEBUG_KERNEL
+
 config KERNEL_COREDUMP
        bool
 
@@ -227,6 +236,16 @@ config KERNEL_RELAY
 config KERNEL_KEXEC
        bool "Enable kexec support"
 
+config KERNEL_PROC_VMCORE
+       bool
+
+config KERNEL_CRASH_DUMP
+       depends on i386 || x86_64 || arm || armeb
+       select KERNEL_KEXEC
+       select KERNEL_PROC_VMCORE
+       bool "Enable support for kexec crashdump"
+       default y
+
 config USE_RFKILL
        bool "Enable rfkill support"
        default RFKILL_SUPPORT
@@ -240,7 +259,7 @@ config KERNEL_DEVTMPFS
        default n
        help
          devtmpfs is a simple, kernel-managed /dev filesystem. The kernel creates
-         devices nodes for all registered devices ti simplify boot, but leaves more
+         devices nodes for all registered devices to simplify boot, but leaves more
          complex tasks to userspace (e.g. udev).
 
 if KERNEL_DEVTMPFS
@@ -593,6 +612,17 @@ config KERNEL_SECCOMP
                help
                  Build kernel with support for seccomp.
 
+#
+# IPv4 configuration
+#
+
+config KERNEL_IP_MROUTE
+       bool "Enable IPv4 multicast routing"
+       default y
+       help
+         Multicast routing requires a multicast routing daemon in
+         addition to kernel support.
+
 #
 # IPv6 configuration
 #
@@ -609,7 +639,11 @@ if KERNEL_IPV6
                def_bool y
 
        config KERNEL_IPV6_MROUTE
-               def_bool y
+               bool "Enable IPv6 multicast routing"
+               default y
+               help
+                 Multicast routing requires a multicast routing daemon in
+                 addition to kernel support.
 
        config KERNEL_IPV6_PIMSM_V2
                def_bool n
@@ -737,3 +771,17 @@ menu "Filesystem ACL and attr support options"
                default y if USE_FS_ACL_ATTR
 
 endmenu
+
+config KERNEL_DEVMEM
+       bool "/dev/mem virtual device support"
+       help
+         Say Y here if you want to support the /dev/mem device.
+         The /dev/mem device is used to access areas of physical
+         memory.
+
+config KERNEL_DEVKMEM
+       bool "/dev/kmem virtual device support"
+       help
+         Say Y here if you want to support the /dev/kmem device. The
+         /dev/kmem device is rarely used, but can be used for certain
+         kind of kernel debugging operations.