binutils: remove defunct binutils default version selection for aarch64

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index ea84619b4ec550313dd4cb76880562aab23b074c..38df455818b54b6421d20c690a41ee3468071c0b 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,24 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       default BINUTILS_VERSION_2_18 if TARGET_ppc44x
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_20_1 if avr32
+       default BINUTILS_VERSION_LINARO if !avr32
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
+       config BINUTILS_VERSION_2_20_1
+               depends on avr32
+               bool "binutils 2.20.1"
+
+       config BINUTILS_VERSION_LINARO
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "Linaro binutils 2.24"
 
-       config BINUTILS_VERSION_2_19_1
-               depends !TARGET_avr32
-               bool "binutils 2.19.1"
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string
-       prompt "Additional binutils options" if TOOLCHAINOPTS
+       prompt "Additional binutils configure options" if TOOLCHAINOPTS
        default ""
        help
            Any additional binutils options you may want to include....
@@ -26,8 +27,6 @@ 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.18"            if TARGET_avr32
-       default "2.18"            if TARGET_ppc44x
-       default "2.19.1"
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1 || avr32
+       default "linaro"          if BINUTILS_VERSION_LINARO
+       default "linaro"