linux/generic: fix block2mtd for 2.6.38

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index bfc50c7..fb81d13 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,22 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_19_1 if ubicom32
+       default BINUTILS_VERSION_2_20_1
        help
          Select the version of binutils you wish to use.
 
        config BINUTILS_VERSION_2_19_1
                bool "binutils 2.19.1"
 
-        config BINUTILS_VERSION_2_20_1
-                depends !avr32
-                depends !ubicom32
-                bool "binutils 2.20.1"
+       config BINUTILS_VERSION_2_20_1
+               depends !ubicom32
+               bool "binutils 2.20.1"
 
-       config BINUTILS_VERSION_CS
-               depends !avr32
+       config BINUTILS_VERSION_2_21
                depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+               depends !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.21"
 
 endchoice
 
@@ -34,5 +33,6 @@ config BINUTILS_VERSION
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
        default "2.19.1"          if BINUTILS_VERSION_2_19_1
        default "2.20.1"          if BINUTILS_VERSION_2_20_1
-       default "2.19.1+cs"       if BINUTILS_VERSION_CS
-       default "2.19.1"
+       default "2.21"            if BINUTILS_VERSION_2_21
+       default "2.19.1"          if ubicom32
+       default "2.20.1"