X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d14fa7ba1f16d934dce3a1752340712d646c5d2d..6ac33b7908f3bf511f7dfdd96b46a9e9dce435ab:/toolchain/uClibc/Config.in

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index ae0bcde62..c4f41aedb 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,12 +1,11 @@
 # Choose uclibc version.
 
 choice
-	prompt "uClibc Version" if TOOLCHAINOPTS
-	default UCLIBC_VERSION_0_9_28 if LINUX_2_4
+	prompt "uClibc Version"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
 	default UCLIBC_VERSION_0_9_29
 	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"
@@ -15,16 +14,26 @@ choice
 		bool "uClibc 0.9.28"
 
 	config UCLIBC_VERSION_0_9_29
-		depends !LINUX_2_4
 		bool "uClibc 0.9.29"
 
+	config UCLIBC_VERSION_0_9_30
+		bool "uClibc 0.9.30"
+
 endchoice
 
+config UCLIBC_VERSION_NPTL
+	bool "Use NPTL branch"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	depends on UCLIBC_VERSION_0_9_30
+
+
 config UCLIBC_EXTRA_VERSION
 	string
-	prompt "Extra uClibc version" if TOOLCHAINOPTS
+	prompt "Extra uClibc version"
+	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"