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

diff --git a/Config.in b/Config.in
index b800fc6f4d..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"
@@ -311,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
 	#
@@ -448,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