X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/158bc02f791b4d227201ccf0d1f75f5cc61ce69a..fc2b3ea6b43c7b7c5b8d89a26252fa9cfc2be6d7:/Config.in

diff --git a/Config.in b/Config.in
index b5b65abd2..e07d803eb 100644
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -23,11 +23,9 @@ menu "Target Images"
 	choice
 		prompt "ramdisk compression"
 		depends TARGET_ROOTFS_INITRAMFS
-		depends !LINUX_2_6_21
 		depends !LINUX_2_6_25
-		depends !LINUX_2_6_27
-		depends !LINUX_2_6_28
 		default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
+		default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
 		default TARGET_INITRAMFS_COMPRESSION_NONE
 		help
 		  Select ramdisk compression.
@@ -43,6 +41,9 @@ menu "Target Images"
 
 		config TARGET_INITRAMFS_COMPRESSION_LZMA
 			bool "LZMA"
+
+		config TARGET_INITRAMFS_COMPRESSION_LZO
+			bool "LZO"
 	endchoice
 
 	config TARGET_ROOTFS_JFFS2
@@ -59,17 +60,15 @@ menu "Target Images"
 		help
 		  Build a squashfs-lzma root filesystem
 
-	config TARGET_ROOTFS_TGZ
-		bool "tgz"
-		default y if USES_TGZ
-		depends !TARGET_ROOTFS_INITRAMFS
+	config TARGET_ROOTFS_TARGZ
+		bool "tar.gz"
+		default y if USES_TARGZ
 		help
 		  Build a compressed tar archive of the the root filesystem
 
 	config TARGET_ROOTFS_CPIOGZ
-		bool "cpiogz"
+		bool "cpio.gz"
 		default y if USES_CPIOGZ
-		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a compressed cpio archive of the the root filesystem
 
@@ -87,6 +86,13 @@ menu "Target Images"
 		help
 		  Create some bootable ISO image
 
+	config TARGET_ROOTFS_UBIFS
+		bool "ubifs"
+		default y if USES_UBIFS
+		depends !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+		help
+		  Build a ubifs root filesystem
+
 comment "Image Options"
 
 source "target/linux/*/image/Config.in"
@@ -138,6 +144,7 @@ config SHADOW_PASSWORDS
 
 choice
 	prompt "Binary stripping method"
+	default USE_STRIP   if EXTERNAL_TOOLCHAIN
 	default USE_STRIP   if USE_GLIBC || USE_EGLIBC
 	default USE_SSTRIP
 	help
@@ -156,13 +163,30 @@ choice
 
 	config USE_SSTRIP
 		bool "sstrip"
+		depends !DEBUG
 		depends !USE_GLIBC
 		depends !USE_EGLIBC
 		help
 		  This will install binaries stripped using sstrip
-
 endchoice
 
+config BUILD_PATENTED
+	default y
+	bool "Compile with support for patented functionality"
+	help
+	  When this option is disabled, software which provides patented functionality will not be built.
+	  In case software provides optional support for patented functionality,
+	  this optional support will get disabled for this package.
+
+config STRIP_ARGS
+	string
+	prompt "Strip arguments"
+	depends USE_STRIP
+	default "--strip-unneeded --remove-section=.comment --remove-section=.note" if DEBUG
+	default "--strip-all"
+	help
+	  Specifies arguments passed to the strip command when stripping binaries
+
 config USE_MKLIBS
 	bool "Strip unnecessary functions from libraries"
 	help
@@ -186,14 +210,7 @@ config DEBUG
 	prompt "Compile packages with debugging info"
 	default n
 	help
-		Disables stripping and adds -g3 to the CFLAGS
-
-config DEBUG_DIR
-	bool "Install debugging binaries into a staging directory"
-	default n
-	help
-		This will install all compiled package binaries into build_dir/target-*/debug-*/,
-		useful for cross-debugging via gdb/gdbserver
+		Adds -g3 to the CFLAGS
 
 config IPV6
         bool
@@ -231,7 +248,6 @@ endmenu
 menuconfig DEVEL
 	bool "Advanced configuration options (for developers)"
 	default n
-	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
 	bool
@@ -329,6 +345,7 @@ source "toolchain/Config.in"
 
 source "target/imagebuilder/Config.in"
 source "target/sdk/Config.in"
+source "target/toolchain/Config.in"
 
 source "tmp/.config-package.in"