[au1000] revert upstream commit that broke PCI until we have a better fix

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

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 74c38fe..643b45f 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,20 +3,31 @@
 choice
        prompt "uClibc Version"
        depends on TOOLCHAINOPTS && USE_UCLIBC
 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)
+       default UCLIBC_VERSION_0_9_30_1

        help
          Select the version of uClibc you wish to use.
 
        help
          Select the version of uClibc you wish to use.
 

-       config UCLIBC_VERSION_0_9_29
-               bool "uClibc 0.9.29"
-

        config UCLIBC_VERSION_0_9_30_1
                bool "uClibc 0.9.30.1"
 
        config UCLIBC_VERSION_0_9_30_1
                bool "uClibc 0.9.30.1"
 

-       config UCLIBC_VERSION_NPTL
-               bool "uClibc NPTL branch"
-               depends BROKEN
+       config UCLIBC_VERSION_0_9_30_2
+               bool "uClibc 0.9.30.2"
+
+       config UCLIBC_VERSION_0_9_30_3
+               bool "uClibc 0.9.30.3"
+
+       config UCLIBC_VERSION_0_9_31
+               bool "uClibc 0.9.31"
+
+       config UCLIBC_VERSION_0_9_32
+               bool "uClibc 0.9.32 (with nptl support)"

 
 endchoice
 
 
 endchoice
 

+
+# Debug version.
+
+config UCLIBC_ENABLE_DEBUG
+       bool "Build with debug information"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
+       default n