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

diff --git a/Config.in b/Config.in
index b5b65abd2..1f689c066 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.
@@ -25,8 +25,6 @@ menu "Target Images"
 		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_NONE
 		help
@@ -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
@@ -87,6 +88,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 +146,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,6 +165,7 @@ choice
 
 	config USE_SSTRIP
 		bool "sstrip"
+		depends !DEBUG
 		depends !USE_GLIBC
 		depends !USE_EGLIBC
 		help
@@ -186,7 +196,7 @@ config DEBUG
 	prompt "Compile packages with debugging info"
 	default n
 	help
-		Disables stripping and adds -g3 to the CFLAGS
+		Adds -g3 to the CFLAGS
 
 config DEBUG_DIR
 	bool "Install debugging binaries into a staging directory"
@@ -231,7 +241,6 @@ endmenu
 menuconfig DEVEL
 	bool "Advanced configuration options (for developers)"
 	default n
-	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
 	bool
@@ -329,6 +338,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"