[kernel] update to new stable 2.6.27.24

[openwrt.git] / toolchain / uClibc / Config.in

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 09453bf..74c38fe 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,26 +1,22 @@
-# Choose uClibc options
-#
-if CONFIG_DEVEL
-       comment "uClibc Options"
-endif
+# Choose uclibc version.
 
-config BR2_UCLIBC_VERSION_SNAPSHOT
-       bool
-       prompt "Use the daily snapshot of uClibc?" if CONFIG_DEVEL
-       default n
+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
-           Would you like to use the latest daily snapshot?
+         Select the version of uClibc you wish to use.
 
-config BR2_USE_UCLIBC_SNAPSHOT
-       string
-       default "snapshot"
-       depends on BR2_UCLIBC_VERSION_SNAPSHOT
+       config UCLIBC_VERSION_0_9_29
+               bool "uClibc 0.9.29"
 
-config BR2_ENABLE_LOCALE
-       bool
-       prompt "Enable locale/gettext/i18n support?" if CONFIG_DEVEL
-       default n
-       help
-           Enable locale/gettext/i18n support?
+       config UCLIBC_VERSION_0_9_30_1
+               bool "uClibc 0.9.30.1"
+
+       config UCLIBC_VERSION_NPTL
+               bool "uClibc NPTL branch"
+               depends BROKEN
 
+endchoice