X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Config.in;h=ef6f1c61222f05a921874845e2eea478b7f09062;hb=c9926f77b450d45fa30356fa77d6477356982ab5;hp=5c154691dd2ca356486d20d462760d05de2122cf;hpb=f54a6df1e15d0b763a9f37140d6440e2e158da5f;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/Config.in b/Config.in
index 5c154691dd..ef6f1c6122 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,28 +85,32 @@ 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
 		bool "ubifs"
 		default y if USES_UBIFS
-		depends on !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+		depends on USES_UBIFS
 		help
 		  Build a ubifs root filesystem
 
@@ -300,6 +303,9 @@ menu "Global build settings"
 	config KERNEL_RELAY
 		bool
 
+	config KERNEL_KEXEC
+		bool "Enable kexec support"
+
 	#
 	# CGROUP support symbols
 	#
@@ -568,6 +574,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 +596,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 +736,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