binutils: Use 2.31.1 by default

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 7b5127b46f3575228269bfbb268763afedf0a964..14c0d53d43431b5413355836fd098f292373bb53 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,31 +2,30 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_USE_VERSION_2_31_1 if !arc
+       default BINUTILS_USE_VERSION_2_29_ARC if arc
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_18
-               depends !ubicom32
-               bool "binutils 2.18"
+       config BINUTILS_USE_VERSION_2_29_ARC
+               depends on arc
+               bool "ARC binutils 2.29"
+               select BINUTILS_VERSION_2_29_ARC
 
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
+       config BINUTILS_USE_VERSION_2_29_1
+               depends on !arc
+               bool "Binutils 2.29.1"
+               select BINUTILS_VERSION_2_29_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_USE_VERSION_2_30
+               depends on !arc
+               bool "Binutils 2.30"
+               select BINUTILS_VERSION_2_30
 
-       config BINUTILS_VERSION_CS
-               depends !avr32
-               depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+       config BINUTILS_USE_VERSION_2_31_1
+               depends on !arc
+               bool "Binutils 2.31.1"
+               select BINUTILS_VERSION_2_31_1
 
 endchoice
 
@@ -36,13 +35,3 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
        default ""
        help
            Any additional binutils options you may want to include....
-
-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"            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"