X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Config.in;h=5b4522ea442c74b8667db0c48ed8b8dbbc0d7536;hp=c288cfbec19fa340853b78cf122a275f7af14097;hb=8bdba22449d1a6187072c6241cfce94cd553d8eb;hpb=e75eb47559ea942b45e22acd221899f86534a84b

diff --git a/Config.in b/Config.in
index c288cfbec1..5b4522ea44 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
@@ -125,6 +124,13 @@ menu "Target Images"
 		help
 		    Allows you to change the maximum number of inodes in the root filesystem
 
+	config TARGET_ROOTFS_RESERVED_PCT
+		int "Percentage of reserved blocks in root filesystem"
+		depends TARGET_ROOTFS_EXT4FS
+		default 5
+		help
+		    Allows you to change the percentage of reserved blocks in the root filesystem
+
 endmenu
 
 menu "Global build settings"
@@ -154,6 +160,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"
@@ -187,9 +200,14 @@ menu "Global build settings"
 		  debugging files into. Enable this option to be able to read and
 		  write to these files.
 
+	config KERNEL_PERF_EVENTS
+		bool
+		default n
+
 	config KERNEL_PROFILING
 		bool "Compile the kernel with profiling enabled"
 		default n
+		select KERNEL_PERF_EVENTS
 		help
 		  Enable the extended profiling support mechanisms used by profilers such
 		  as OProfile.
@@ -200,6 +218,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 +238,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
 
@@ -251,6 +284,9 @@ menu "Global build settings"
 		bool "Enable printk timestamps"
 		default y
 
+	config KERNEL_RELAY
+		bool
+
 	comment "Package build options"
 
 	config DEBUG
@@ -270,32 +306,38 @@ menu "Global build settings"
 	config PKG_BUILD_PARALLEL
 		bool
 		prompt "Compile certain packages parallelized"
-		default n
+		default y
 		help
 		  This adds a -jX option to certain packages that are known to
-		  behave well for parallel build.
+		  behave well for parallel build. By default the package make processes
+		  use the main jobserver, in which case this option only takes effect
+		  when you add -jX to the make command.
+
+		  If you are unsure, select N.
+
+	config PKG_BUILD_USE_JOBSERVER
+		bool
+		prompt "Use top-level make jobserver for packages"
+		depends on PKG_BUILD_PARALLEL
+		default y
+		help
+		  This passes the main make process jobserver fds to package builds,
+		  enabling full parallelization across different packages
 
-		  Note that this may overcommit CPU resources depending on the
+		  Note that disabling this may overcommit CPU resources depending on the
 		  -j level of the main make process, the number of package
 		  submake jobs selected below and the number of actual CPUs present.
 		  Example: If the main make is passed a -j4 and the submake -j
 		  is also set to 4, we may end up with 16 parallel make processes
 		  in the worst case.
 
-		  You get maximum build performance, if you set the package build
-		  jobs to the number of CPUs (cores) available and also start the main
-		  make process with -jX, where X is the number of CPUs (cores).
-		  However, make sure you have enough RAM available for
-		  NR_CPUS to the power of two (NR_CPUS^2) make jobs.
-
-		  If you are unsure, select N.
 
 	config PKG_BUILD_JOBS
 		int
 		prompt "Number of package submake jobs (2-512)"
 		range 2 512
 		default 2
-		depends on PKG_BUILD_PARALLEL
+		depends on PKG_BUILD_PARALLEL && !PKG_BUILD_USE_JOBSERVER
 		help
 		  The number of jobs (-jX) to pass to packages submake.
 
@@ -303,6 +345,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 +361,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 +425,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