remove support for ubicom32

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 55e53ba8f583815be8880b0c5c2a02695ea23b01..414b1d905a412c47009e79d1ecdcd29c1b9255cf 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,8 +2,9 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_19_1 if ubicom32
-       default BINUTILS_VERSION_2_20_1
+       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_20_1 if avr32
+       default BINUTILS_VERSION_2_22
        help
          Select the version of binutils you wish to use.
 
@@ -11,19 +12,20 @@ choice
                bool "binutils 2.19.1"
 
        config BINUTILS_VERSION_2_20_1
-               depends !ubicom32
+               depends avr32
                bool "binutils 2.20.1"
 
-       config BINUTILS_VERSION_2_21
-               depends !ubicom32
+       config BINUTILS_VERSION_2_21_1
                depends !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.21"
+               bool "binutils 2.21.1"
 
-       config BINUTILS_VERSION_CS
-               depends !avr32
-               depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+       config BINUTILS_VERSION_2_22
+               depends !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.22"
+
+       config BINUTILS_VERSION_2_23_1
+               depends !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.23.1"
 
 endchoice
 
@@ -39,7 +41,8 @@ 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.21"            if BINUTILS_VERSION_2_21
-       default "2.19.1+cs"       if BINUTILS_VERSION_CS
-       default "2.19.1"          if ubicom32
-       default "2.20.1"
+       default "2.21.1"          if BINUTILS_VERSION_2_21_1
+       default "2.22"            if BINUTILS_VERSION_2_22
+       default "2.23.1"          if BINUTILS_VERSION_2_23_1
+       default "2.20.1"          if avr32
+       default "2.22"