X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Config.in;h=2733ecb6950b3f3c297ed8690a05bd9d0487b400;hb=639ee81002e57018a4941b2dd8be1a9b560da67b;hp=736a97282fc198a9bed0d80ed8e0b7e2f4dd7866;hpb=f656990897a16d76164d05090ac8d9774c5578b9;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/Config.in b/Config.in
index 736a97282f..2733ecb695 100644
--- a/Config.in
+++ b/Config.in
@@ -46,9 +46,16 @@ menu "Target Images"
 
 			config TARGET_INITRAMFS_COMPRESSION_XZ
 				bool "xz"
-				depends LINUX_2_6_38
+				depends !LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36&&!LINUX_2_6_37
 		endchoice
 
+		config EXTERNAL_CPIO
+			string
+			prompt "Use external cpio" if TARGET_ROOTFS_INITRAMFS
+			default ""
+			help
+			  Kernel uses specified external cpio as INITRAMFS_SOURCE
+
 	comment "Root filesystem archives"
 
 	config TARGET_ROOTFS_CPIOGZ
@@ -145,7 +152,7 @@ menu "Global build settings"
 		bool "Compile with full language support"
 		help
 		  When this option is enabled, packages are built with the full versions of iconv and GNU gettext
-		  instead of the default OpenWrt stubs.
+		  instead of the default OpenWrt stubs. If uClibc is used, it is also built with locale support.
 
 	config SHADOW_PASSWORDS
 		bool
@@ -193,6 +200,15 @@ menu "Global build settings"
 		help
 		  This will give you more information in stack traces from kernel oopses
 
+	config KERNEL_FTRACE
+		bool "Compile the kernel with tracing support"
+		default n
+
+	config KERNEL_ENABLE_DEFAULT_TRACERS
+		bool "Trace process context switches and events"
+		depends on KERNEL_FTRACE
+		default n
+
 	config KERNEL_DEBUG_KERNEL
 		bool
 		default n
@@ -229,7 +245,7 @@ menu "Global build settings"
 
 	config KERNEL_MAGIC_SYSRQ
 		bool "Compile the kernel with SysRq support"
-		default n
+		default y
 
 	config KERNEL_ELF_CORE
 		bool "Enable process core dump support"