scripts/feeds: ensure that --ff is enabled

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

diff --git a/Config.in b/Config.in
index b800fc6f4d9a95f28e08c5a7600456497f4bca61..40a74e77abae54631c4ab523a085255b49f2ddc0 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
 
+       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"
@@ -311,6 +327,10 @@ menu "Global build settings"
        config KERNEL_KEXEC
                bool "Enable kexec support"
 
+       config USE_RFKILL
+               bool "Enable rfkill support"
+               default RFKILL_SUPPORT
+
        #
        # CGROUP support symbols
        #
@@ -448,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.
 
-               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
+                       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
@@ -832,6 +849,12 @@ menuconfig DEVEL
                  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