imx6: update upstream pcie patches

[openwrt/svn-archive/archive.git] / Config.in

diff --git a/Config.in b/Config.in
index ef6f1c61222f05a921874845e2eea478b7f09062..2074245758c6b8c578df3c9fc381c932a955dd3f 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -139,6 +139,22 @@ menu "Target Images"
                help
                  Allows you to change the percentage of reserved blocks in the root filesystem
 
                help
                  Allows you to change the percentage of reserved blocks in the root filesystem
 

+       config TARGET_ROOTFS_INCLUDE_KERNEL
+               bool "Include kernel in root filesystem"
+               depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+               default n if USES_UBIFS
+               help
+                 Include the kernel image in the rootfs. Typically the image is placed
+                 below /boot.
+
+       config TARGET_ROOTFS_INCLUDE_DTB
+               bool "Include DTB in root filesystem"
+               depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+               default n if USES_UBIFS
+               help
+                 Include the device tree blob file(s) in the rootfs. Typically the DTBs
+                 are placed below /boot.
+

 endmenu
 
 menu "Global build settings"
 endmenu
 
 menu "Global build settings"


@@ -230,6 +246,11 @@ menu "Global build settings"
                bool "Compile the kernel with tracing support"
                default n
 
                bool "Compile the kernel with tracing support"
                default n
 

+       config KERNEL_FTRACE_SYSCALLS
+               bool "Trace system calls"
+               depends on KERNEL_FTRACE
+               default n
+

        config KERNEL_ENABLE_DEFAULT_TRACERS
                bool "Trace process context switches and events"
                depends on KERNEL_FTRACE
        config KERNEL_ENABLE_DEFAULT_TRACERS
                bool "Trace process context switches and events"
                depends on KERNEL_FTRACE


@@ -306,6 +327,10 @@ menu "Global build settings"
        config KERNEL_KEXEC
                bool "Enable kexec support"
 
        config KERNEL_KEXEC
                bool "Enable kexec support"
 

+       config USE_RFKILL
+               bool "Enable rfkill support"
+               default RFKILL_SUPPORT
+

        #
        # CGROUP support symbols
        #
        #
        # CGROUP support symbols
        #


@@ -443,13 +468,10 @@ menu "Global build settings"
                          the kmem extension can use it to guarantee that no group of processes
                          will ever exhaust kernel resources alone.
 
                          the kmem extension can use it to guarantee that no group of processes
                          will ever exhaust kernel resources alone.
 

-               config KERNEL_PERF_EVENTS
-                       bool
-                       default y if KERNEL_CGROUP_PERF
-

                config KERNEL_CGROUP_PERF
                        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
                        default n
                config KERNEL_CGROUP_PERF
                        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
                        default n

+                       select KERNEL_PERF_EVENTS

                        help
                          This option extends the per-cpu mode to restrict monitoring to
                          threads which belong to the cgroup specified and run on the
                        help
                          This option extends the per-cpu mode to restrict monitoring to
                          threads which belong to the cgroup specified and run on the


@@ -827,6 +849,12 @@ menuconfig DEVEL
                  in the package directory, pointing to the .git tree that you want
                  to pull the source code from
 
                  in the package directory, pointing to the .git tree that you want
                  to pull the source code from
 

+       config EXTRA_OPTIMIZATION
+               string "Additional compiler options" if DEVEL
+               default "-fno-caller-saves"
+               help
+                 Extra Target-independent optimizations to use when building for the target.
+

 menuconfig TARGET_OPTIONS
        bool "Target Options"  if DEVEL
 
 menuconfig TARGET_OPTIONS
        bool "Target Options"  if DEVEL
 


@@ -851,6 +879,8 @@ menuconfig TARGET_OPTIONS
        config USE_MIPS16
                bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
                depends on HAS_MIPS16
        config USE_MIPS16
                bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
                depends on HAS_MIPS16

+               depends on !GCC_VERSION_4_6
+               default y

                help
                  If your target CPU does support the MIPS16 instruction set
                  and you want to use it for packages, enable this option.
                help
                  If your target CPU does support the MIPS16 instruction set
                  and you want to use it for packages, enable this option.