X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=Config.in;h=a7ef477b200091b13079253b52a352f784312e9d;hp=5c154691dd2ca356486d20d462760d05de2122cf;hb=1ef1a974f54e88864a44de1ed773a4e9876c86e2;hpb=b70c4a85fbf28f18d316ca5c7aca9a6afad61abe

diff --git a/Config.in b/Config.in
index 5c154691dd..a7ef477b20 100644
--- a/Config.in
+++ b/Config.in
@@ -78,7 +78,6 @@ menu "Target Images"
 	config TARGET_ROOTFS_EXT4FS
 		bool "ext4"
 		default y if USES_EXT4
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Ext4 file system with some free space for uml images
 
@@ -86,31 +85,69 @@ menu "Target Images"
 		bool "iso"
 		default n
 		depends on TARGET_x86_generic
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Create some bootable ISO image
 
 	config TARGET_ROOTFS_JFFS2
 		bool "jffs2"
 		default y if USES_JFFS2
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a jffs2 root filesystem
 
+	config TARGET_ROOTFS_JFFS2_NAND
+		bool "jffs2 for NAND"
+		default y if USES_JFFS2_NAND
+		depends on USES_JFFS2_NAND
+		help
+		  Build a jffs2 root filesystem for NAND flash
+
 	config TARGET_ROOTFS_SQUASHFS
 		bool "squashfs"
 		default y if USES_SQUASHFS
-		depends on !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a squashfs-lzma root filesystem
 
-	config TARGET_ROOTFS_UBIFS
+	menuconfig TARGET_ROOTFS_UBIFS
 		bool "ubifs"
 		default y if USES_UBIFS
-		depends on !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+		depends on USES_UBIFS
 		help
 		  Build a ubifs root filesystem
 
+		choice
+			prompt "compression"
+			default TARGET_UBIFS_COMPRESSION_NONE
+			depends on TARGET_ROOTFS_UBIFS
+			help
+			  Select compression type
+
+			config TARGET_UBIFS_COMPRESSION_NONE
+				bool "none"
+
+			config TARGET_UBIFS_COMPRESSION_LZO
+				bool "lzo"
+
+			config TARGET_UBIFS_COMPRESSION_ZLIB
+				bool "zlib"
+		endchoice
+
+		config TARGET_UBIFS_FREE_SPACE_FIXUP
+			bool "free space fixup" if TARGET_ROOTFS_UBIFS
+			default y
+			help
+			  The file-system free space has to be fixed up on first mount
+
+		config TARGET_UBIFS_JOURNAL_SIZE
+			string
+			prompt "journal size" if TARGET_ROOTFS_UBIFS
+			default "512KiB"
+
+		config TARGET_UBIFS_SQUASH_UIDS
+			bool "squash uids" if TARGET_ROOTFS_UBIFS
+			default n
+			help
+			  Squash owners making all files owned by root
+
 	comment "Image Options"
 
 	source "target/linux/*/image/Config.in"
@@ -136,6 +173,22 @@ menu "Target Images"
 		help
 		  Allows you to change the percentage of reserved blocks in the root filesystem
 
+	config TARGET_ROOTFS_INCLUDE_KERNEL
+		bool "Include kernel in root filesystem"
+		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+		default n if USES_UBIFS
+		help
+		  Include the kernel image in the rootfs. Typically the image is placed
+		  below /boot.
+
+	config TARGET_ROOTFS_INCLUDE_DTB
+		bool "Include DTB in root filesystem"
+		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
+		default n if USES_UBIFS
+		help
+		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
+		  are placed below /boot.
+
 endmenu
 
 menu "Global build settings"
@@ -227,6 +280,11 @@ menu "Global build settings"
 		bool "Compile the kernel with tracing support"
 		default n
 
+	config KERNEL_FTRACE_SYSCALLS
+		bool "Trace system calls"
+		depends on KERNEL_FTRACE
+		default n
+
 	config KERNEL_ENABLE_DEFAULT_TRACERS
 		bool "Trace process context switches and events"
 		depends on KERNEL_FTRACE
@@ -300,6 +358,13 @@ menu "Global build settings"
 	config KERNEL_RELAY
 		bool
 
+	config KERNEL_KEXEC
+		bool "Enable kexec support"
+
+	config USE_RFKILL
+		bool "Enable rfkill support"
+		default RFKILL_SUPPORT
+
 	#
 	# CGROUP support symbols
 	#
@@ -437,13 +502,10 @@ menu "Global build settings"
 			  the kmem extension can use it to guarantee that no group of processes
 			  will ever exhaust kernel resources alone.
 
-		config KERNEL_PERF_EVENTS
-			bool
-			default y if KERNEL_CGROUP_PERF
-
 		config KERNEL_CGROUP_PERF
 			bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
 			default n
+			select KERNEL_PERF_EVENTS
 			help
 			  This option extends the per-cpu mode to restrict monitoring to
 			  threads which belong to the cgroup specified and run on the
@@ -568,6 +630,18 @@ menu "Global build settings"
 			  Allow user space to create what appear to be multiple instances
 			  of the network stack.
 
+	endif
+
+	#
+	# LXC related symbols
+	#
+
+	config KERNEL_LXC_MISC
+		bool "Enable miscellaneous LXC related options"
+		default n
+
+	if KERNEL_LXC_MISC
+
 		config KERNEL_DEVPTS_MULTIPLE_INSTANCES
 			bool "Support multiple instances of devpts"
 			default y
@@ -578,6 +652,20 @@ menu "Global build settings"
 			  filesystem with the '-o newinstance' option will create an
 			  independent PTY namespace.
 
+		config KERNEL_POSIX_MQUEUE
+			bool "POSIX Message Queues"
+			default n
+			help
+			  POSIX variant of message queues is a part of IPC. In POSIX message
+			  queues every message has a priority which decides about succession
+			  of receiving it by a process. If you want to compile and run
+			  programs written e.g. for Solaris with use of its POSIX message
+			  queues (functions mq_*) say Y here.
+
+			  POSIX message queues are visible as a filesystem called 'mqueue'
+			  and can be mounted somewhere if you want to do filesystem
+			  operations on message queues.
+
 	endif
 
 	comment "Package build options"
@@ -704,21 +792,19 @@ 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
 
-	if INSTALL_LIBSTDCPP
-		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.
+	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_UCLIBCXX
+			bool "uClibc++"
 
-			config USE_LIBSTDCXX
-				bool "libstdc++"
-		endchoice
-	endif
+		config USE_LIBSTDCXX
+			bool "libstdc++"
+	endchoice
 
 endmenu
 
@@ -797,6 +883,12 @@ menuconfig DEVEL
 		  in the package directory, pointing to the .git tree that you want
 		  to pull the source code from
 
+	config EXTRA_OPTIMIZATION
+		string "Additional compiler options" if DEVEL
+		default "-fno-caller-saves"
+		help
+		  Extra Target-independent optimizations to use when building for the target.
+
 menuconfig TARGET_OPTIONS
 	bool "Target Options"  if DEVEL
 
@@ -821,6 +913,8 @@ menuconfig TARGET_OPTIONS
 	config USE_MIPS16
 		bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
 		depends on HAS_MIPS16
+		depends on !GCC_VERSION_4_6
+		default y
 		help
 		  If your target CPU does support the MIPS16 instruction set
 		  and you want to use it for packages, enable this option.