X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2FuClibc%2FConfig.in;h=63b121c834b4cc5896532e36c7ff82b565978e13;hp=70834770f267710fdc4f46470e47e8b9afe56fe6;hb=6d59a298e848fc0638920e711b1481b4b7afa18c;hpb=229035bad055b25f74c8d16943bfb31ffb81d4ab

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 70834770f2..63b121c834 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,40 +3,32 @@
 choice
 	prompt "uClibc Version"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default UCLIBC_VERSION_0_9_29
+	default UCLIBC_VERSION_0_9_30_1
 	help
 	  Select the version of uClibc you wish to use.
 
-	config UCLIBC_VERSION_SNAPSHOT
-		depends BROKEN
-		bool "uClibc snapshot"
+	config UCLIBC_VERSION_0_9_30_1
+		bool "uClibc 0.9.30.1"
+
+	config UCLIBC_VERSION_0_9_30_2
+		bool "uClibc 0.9.30.2"
 
-	config UCLIBC_VERSION_0_9_28
-		bool "uClibc 0.9.28"
+	config UCLIBC_VERSION_0_9_30_3
+		bool "uClibc 0.9.30.3"
 
-	config UCLIBC_VERSION_0_9_29
-		bool "uClibc 0.9.29"
+	config UCLIBC_VERSION_0_9_31
+		bool "uClibc 0.9.31"
 
-	config UCLIBC_VERSION_0_9_30
-		bool "uClibc 0.9.30"
+	config UCLIBC_VERSION_NPTL
+		bool "uClibc NPTL branch"
+		depends BROKEN
 
 endchoice
 
-config UCLIBC_VERSION_NPTL
-	bool "Use NPTL branch"
-	depends on TOOLCHAINOPTS && USE_UCLIBC
-	depends on UCLIBC_VERSION_0_9_30
-	depends BROKEN
 
+# Debug version.
 
-config UCLIBC_EXTRA_VERSION
-	string
-	prompt "Extra uClibc version"
+config UCLIBC_ENABLE_DEBUG
+	bool "Build with debug information"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
-	default ".2"         if UCLIBC_VERSION_0_9_28
-	default ".1"         if UCLIBC_VERSION_0_9_30 && !UCLIBC_VERSION_NPTL
-	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.
+	default n