X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Config.in;h=db3094d729863f60b0ac2cb64a6644b13aabee2d;hb=fdfac36ac4b5943a876cc3a771950956f2be4b5d;hp=ef6f1c61222f05a921874845e2eea478b7f09062;hpb=c6a8a03a8f80c428b42e335ef3b152e0a277d2f9;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/Config.in b/Config.in
index ef6f1c6122..db3094d729 100644
--- a/Config.in
+++ b/Config.in
@@ -139,6 +139,20 @@ 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 rootfs"
+		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+		default n if USES_UBIFS
+		help
+		  Include the kernel image in the rootfs
+
+	config TARGET_ROOTFS_INCLUDE_DTB
+		bool "include dtb in rootfs"
+		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+		default n if USES_UBIFS
+		help
+		  Include the device tree blob file in the rootfs
+
 endmenu
 
 menu "Global build settings"
@@ -230,6 +244,11 @@ menu "Global build settings"
 		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
@@ -306,6 +325,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
 	#
@@ -443,13 +466,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