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 6b0791deb318dfaa15bd8c8f4f9fb3e8792c0cab..14c0d53d43431b5413355836fd098f292373bb53 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,17 +2,31 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       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
-               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_USE_VERSION_2_29_1
+               depends on !arc
+               bool "Binutils 2.29.1"
+               select BINUTILS_VERSION_2_29_1
+
+       config BINUTILS_USE_VERSION_2_30
+               depends on !arc
+               bool "Binutils 2.30"
+               select BINUTILS_VERSION_2_30
+
+       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_19_1
-               depends !TARGET_avr32
-               bool "binutils 2.19.1"
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -21,11 +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.18"            if TARGET_avr32
-       default "2.19.1"