[toolchain]: switch to binutils 2.20.1 (except for avr32 and ubicom32)

[openwrt/svn-archive/archive.git] / toolchain / binutils / Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 544f62bdc19a290d55d3a813b0c05979ae40f23e..27a583d8a39fdd5c407a4fd0887e14cab3f3757e 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,18 +2,19 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if avr32
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_19_1 if (avr32 || ubicom32)
+       default BINUTILS_VERSION_2_20_1
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
-
        config BINUTILS_VERSION_2_19_1
-               depends !avr32
                bool "binutils 2.19.1"
 
+        config BINUTILS_VERSION_2_20_1
+                depends !avr32
+                depends !ubicom32
+                bool "binutils 2.20.1"
+
        config BINUTILS_VERSION_CS
                depends !avr32
                depends !ubicom32
@@ -32,8 +33,8 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
        string
        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.20.1"          if BINUTILS_VERSION_2_20_1
        default "2.19.1+cs"       if BINUTILS_VERSION_CS
-       default "2.18"            if avr32
-       default "2.19.1"
+       default "2.19.1"          if (avr32 || ubicom32)
+       default "2.20.1"