[backfire] package/busybox: backport r29299 (wget: URL-decode user:password before...

[openwrt-10.03/.git] / toolchain / binutils / Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 65bc9c980665856647f4fe2d591a7805a76792dd..f57b65bbc8615d01fa9d1a88522bdf2013147f92 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,16 +2,15 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if avr32
        default BINUTILS_VERSION_2_19_1
        help
-         Select the version of binutils you wish to use.
+           Select the version of binutils you wish to use.
 
        config BINUTILS_VERSION_2_18
+               depends !ubicom32
                bool "binutils 2.18"
 
        config BINUTILS_VERSION_2_19_1
-               depends !avr32
                bool "binutils 2.19.1"
 
        config BINUTILS_VERSION_2_20
@@ -19,11 +18,10 @@ choice
                depends !ubicom32
                bool "binutils 2.20"
 
-       config BINUTILS_VERSION_CS
+       config BINUTILS_VERSION_2_20_1
                depends !avr32
                depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+               bool "binutils 2.20.1"
 
 endchoice
 
@@ -40,6 +38,5 @@ config BINUTILS_VERSION
        default "2.18"            if BINUTILS_VERSION_2_18
        default "2.19.1"          if BINUTILS_VERSION_2_19_1
        default "2.20"            if BINUTILS_VERSION_2_20
-       default "2.19.1+cs"       if BINUTILS_VERSION_CS
-       default "2.18"            if avr32
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
        default "2.19.1"