X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Config.in;h=403597804f09089ae01a51f27f6ff9159d2b7d79;hp=c288cfbec19fa340853b78cf122a275f7af14097;hb=14dc0a7a69f59d8df9ba47c1f3bf1f242d16d081;hpb=e75eb47559ea942b45e22acd221899f86534a84b

diff --git a/Config.in b/Config.in
index c288cfbec1..403597804f 100644
--- a/Config.in
+++ b/Config.in
@@ -46,7 +46,6 @@ menu "Target Images"
 
 			config TARGET_INITRAMFS_COMPRESSION_XZ
 				bool "xz"
-				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
@@ -154,6 +153,13 @@ menu "Global build settings"
 		  When this option is enabled, packages are built with the full versions of iconv and GNU gettext
 		  instead of the default OpenWrt stubs. If uClibc is used, it is also built with locale support.
 
+	config BUILD_STATIC_TOOLS
+		default n
+		bool "Attempt to link host utilities statically"
+		help
+		  Linking host utilities like sed or firmware-utils statically increases the portability of the
+		  generated ImageBuilder and SDK tarballs, however it may fail on some Linux distributions.
+
 	config SHADOW_PASSWORDS
 		bool
 		prompt "Enable shadow password support"
@@ -200,6 +206,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
@@ -211,10 +226,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
 
@@ -303,6 +324,7 @@ menu "Global build settings"
 		bool
 		prompt "Parallelize the default package build rule (May break build)"
 		depends on PKG_BUILD_PARALLEL
+		depends on BROKEN
 		default n
 		help
 		  Always set the default package build rules to parallel build.
@@ -318,6 +340,7 @@ menu "Global build settings"
 		bool
 		prompt "Parallelize the toolchain build (May break build)"
 		depends on PKG_BUILD_PARALLEL
+		depends on BROKEN
 		default n
 		help
 		  Build the toolchain with parallel make jobs.
@@ -381,6 +404,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