X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FuClibc%2FConfig.in;h=74c38fe2dd3e94586ae8e0148be1593264799aba;hb=41ac6296955b755d2ca81d318954bfa882e742f6;hp=9b670bd55adc414f277f7c714fde93aa058a61c9;hpb=4f14cc665777120194de73302510657cefc75959;p=openwrt-10.03%2F.git

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 9b670bd55..74c38fe2d 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -4,31 +4,19 @@ choice
 	prompt "uClibc Version"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
 	default UCLIBC_VERSION_0_9_29
+	default UCLIBC_VERSION_0_9_30_1 if (TARGET_uml && x86_64)
 	help
 	  Select the version of uClibc you wish to use.
-	  Default for kernel 2.6 is 0.9.29, for kernel 2.4 it is 0.9.28 .
-
-	config UCLIBC_VERSION_SNAPSHOT
-		bool "uClibc snapshot"
-
-	config UCLIBC_VERSION_0_9_28
-		bool "uClibc 0.9.28"
 
 	config UCLIBC_VERSION_0_9_29
 		bool "uClibc 0.9.29"
 
-	config UCLIBC_VERSION_0_9_30
-		bool "uClibc 0.9.30"
+	config UCLIBC_VERSION_0_9_30_1
+		bool "uClibc 0.9.30.1"
+
+	config UCLIBC_VERSION_NPTL
+		bool "uClibc NPTL branch"
+		depends BROKEN
 
 endchoice
 
-config UCLIBC_EXTRA_VERSION
-	string
-	prompt "Extra uClibc version"
-	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
-	default ".2"         if UCLIBC_VERSION_0_9_28
-	default ""
-	help
-	    Default for version 0.9.28 is ".02", for daily snapshot it's just "snapshot"
-	    For all other versions the default string is empty.