X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Config.in;h=b800fc6f4d9a95f28e08c5a7600456497f4bca61;hb=de69c9edb0665d43ba2caf7fb3f79200f91eb6fc;hp=8dd73cc2586e24cdfa28ad7b3346a227ca8b0153;hpb=9f7ef8d5f0199f12abfd4b1c50d0bfe8484471d7;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/Config.in b/Config.in
index 8dd73cc258..b800fc6f4d 100644
--- a/Config.in
+++ b/Config.in
@@ -78,7 +78,6 @@ menu "Target Images"
 	config TARGET_ROOTFS_EXT4FS
 		bool "ext4"
 		default y if USES_EXT4
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Ext4 file system with some free space for uml images
 
@@ -86,35 +85,32 @@ menu "Target Images"
 		bool "iso"
 		default n
 		depends on TARGET_x86_generic
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Create some bootable ISO image
 
 	config TARGET_ROOTFS_JFFS2
 		bool "jffs2"
 		default y if USES_JFFS2
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a jffs2 root filesystem
 
 	config TARGET_ROOTFS_JFFS2_NAND
 		bool "jffs2 for NAND"
 		default y if USES_JFFS2_NAND
-		depends on !TARGET_ROOTFS_INITRAMFS && USES_JFFS2_NAND
+		depends on USES_JFFS2_NAND
 		help
 		  Build a jffs2 root filesystem for NAND flash
 
 	config TARGET_ROOTFS_SQUASHFS
 		bool "squashfs"
 		default y if USES_SQUASHFS
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a squashfs-lzma root filesystem
 
 	config TARGET_ROOTFS_UBIFS
 		bool "ubifs"
 		default y if USES_UBIFS
-		depends on !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+		depends on USES_UBIFS
 		help
 		  Build a ubifs root filesystem
 
@@ -234,6 +230,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
@@ -307,6 +308,9 @@ menu "Global build settings"
 	config KERNEL_RELAY
 		bool
 
+	config KERNEL_KEXEC
+		bool "Enable kexec support"
+
 	#
 	# CGROUP support symbols
 	#