X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Config.in;h=5f61905c92998c5fa6c7926150cb21748875aca9;hp=331219a335626e648dd92e319c8d040ff8574329;hb=1a8ea96288e1610de797a0c0b0e08161d9309ee1;hpb=61f25b7e33a0b9cf1d96e78620ace287b0ec7b84

diff --git a/Config.in b/Config.in
index 331219a335..5f61905c92 100644
--- a/Config.in
+++ b/Config.in
@@ -46,9 +46,15 @@ menu "Target Images"
 
 			config TARGET_INITRAMFS_COMPRESSION_XZ
 				bool "xz"
-				depends LINUX_2_6_38
 		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 +151,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 +199,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
@@ -204,10 +219,16 @@ menu "Global build settings"
 		help
 		  This will compile your kernel and modules with debug information.
 
+	config KERNEL_DEBUG_LL_UART_NONE
+		bool
+		default n
+		depends on arm
+
 	config KERNEL_DEBUG_LL
 		bool
 		default n
 		depends on arm
+		select KERNEL_DEBUG_LL_UART_NONE
 		help
 		  ARM low level debugging
 
@@ -229,12 +250,21 @@ 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"
 		default y
 
+	config KERNEL_PROVE_LOCKING
+		bool "Enable kernel lock checking"
+		select KERNEL_DEBUG_KERNEL
+		default n
+
+	config KERNEL_PRINTK_TIME
+		bool "Enable printk timestamps"
+		default y
+
 	comment "Package build options"
 
 	config DEBUG
@@ -365,6 +395,21 @@ menu "Global build settings"
 		  Note that this will make the system libraries incompatible with most of the packages
 		  that are not selected during the build process
 
+	choice
+		prompt "Preferred standard C++ library"
+		default USE_LIBSTDCXX if USE_EGLIBC
+		default USE_UCLIBCXX
+		help
+		  Select the preferred standard C++ library for all packages that support this.
+
+		config USE_UCLIBCXX
+			bool "uClibc++"
+
+		config USE_LIBSTDCXX
+			bool "libstdc++"
+
+	endchoice
+
 endmenu
 
 menuconfig DEVEL