toolchain: binutils: Use version 2.34 by default

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 50ee615a04a75b376d227dc693311d8743020d65..e9b2d30422939cc7406b05b62a97d45a2f50ff1b 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,33 +2,27 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_19_1 if ubicom32
-       default BINUTILS_VERSION_2_20_1
+       default BINUTILS_USE_VERSION_2_34
        help
          Select the version of binutils you wish to use.
 
-       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_1
-               depends !ubicom32
-               bool "binutils 2.20.1"
+       config BINUTILS_USE_VERSION_2_31_1
+               depends on !arc
+               bool "Binutils 2.31.1"
+               select BINUTILS_VERSION_2_31_1
 
-       config BINUTILS_VERSION_2_21
-               depends !ubicom32
-               depends !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.21"
-
-       config BINUTILS_VERSION_2_21_1
-               depends !ubicom32
-               depends !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.21.1"
-
-       config BINUTILS_VERSION_2_22
-               depends !ubicom32
-               depends !avr32
-               bool "binutils 2.22"
+       config BINUTILS_USE_VERSION_2_32
+               bool "Binutils 2.32"
+               select BINUTILS_VERSION_2_32
 
+       config BINUTILS_USE_VERSION_2_34
+               bool "Binutils 2.34"
+               select BINUTILS_VERSION_2_34
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -37,14 +31,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.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.21.1"          if BINUTILS_VERSION_2_21_1
-       default "2.22"            if BINUTILS_VERSION_2_22
-       default "2.19.1"          if ubicom32
-       default "2.20.1"