[backfire] backport r27648

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 6b0791deb318dfaa15bd8c8f4f9fb3e8792c0cab..7b5127b46f3575228269bfbb268763afedf0a964 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,17 +2,32 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if TARGET_avr32
        default BINUTILS_VERSION_2_19_1
        help
          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 !TARGET_avr32
                bool "binutils 2.19.1"
+
+       config BINUTILS_VERSION_2_20
+               depends !avr32
+               depends !ubicom32
+               bool "binutils 2.20"
+        config BINUTILS_VERSION_2_20_1
+                depends !avr32
+                depends !ubicom32
+                bool "binutils 2.20.1"
+
+       config BINUTILS_VERSION_CS
+               depends !avr32
+               depends !ubicom32
+               depends BROKEN
+               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -27,5 +42,7 @@ config BINUTILS_VERSION
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
        default "2.18"            if BINUTILS_VERSION_2_18
        default "2.19.1"          if BINUTILS_VERSION_2_19_1
-       default "2.18"            if TARGET_avr32
+       default "2.20"            if BINUTILS_VERSION_2_20
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.19.1+cs"       if BINUTILS_VERSION_CS
        default "2.19.1"