X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Config.in;h=0553712f7654aa2a5c7eed5c0f9f2681549bfe9e;hb=98fb391ab137ee056b1995a2cfb7b2f64f390114;hp=6441bf41fb4f9603ef475b3b13b6dfd7f68c292f;hpb=5c24c145947fbb876a9e6979d19a412e64ba590b;p=openwrt.git

diff --git a/Config.in b/Config.in
index 6441bf41fb..0553712f76 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
 
@@ -226,8 +247,23 @@ menu "Global build settings"
 	config KERNEL_AIO
 		bool "Compile the kernel with asynchronous IO support"
 		default n
-		help
-		  This will give you more information in stack traces from kernel oopses
+
+	config KERNEL_MAGIC_SYSRQ
+		bool "Compile the kernel with SysRq support"
+		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"
 
@@ -281,6 +317,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.
@@ -296,6 +333,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.
@@ -359,6 +397,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
@@ -423,6 +476,19 @@ menuconfig DEVEL
 		  In this instance, the --refererence option of git clone will
 		  be used thus creating a quick local clone of your repo.
 
+	config BUILD_LOG
+		bool "Enable log files during build process" if DEVEL
+		help
+		  If enabled log files will be written to the ./log directory
+
+	config SRC_TREE_OVERRIDE
+		bool "Enable package source tree override" if DEVEL
+		help
+		  If enabled, you can force a package to use a git tree as source
+		  code instead of the normal tarball. Create a symlink 'git-src'
+		  in the package directory, pointing to the .git tree that you want
+		  to pull the source code from
+
 menuconfig TARGET_OPTIONS
 	bool "Target Options"  if DEVEL