gcc: remove 4.4.7 (only used by avr32)

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index e8f1b8f..ade0b22 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,29 +2,19 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
+       default BINUTILS_VERSION_2_23_1 if (aarch64 || aarch64_be)
        default BINUTILS_VERSION_2_20_1 if avr32
-       default BINUTILS_VERSION_2_22 if !avr32
+       default BINUTILS_VERSION_LINARO if !avr32
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
-
        config BINUTILS_VERSION_2_20_1
                depends on avr32
                bool "binutils 2.20.1"
 
-       config BINUTILS_VERSION_2_21_1
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.21.1"
-
-       config BINUTILS_VERSION_2_22
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.22"
-
-       config BINUTILS_VERSION_2_23_1
+       config BINUTILS_VERSION_LINARO
                depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.23.1"
+               bool "Linaro binutils 2.24"
 
 endchoice
 
@@ -38,10 +28,6 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 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.1"          if BINUTILS_VERSION_2_21_1
-       default "2.22"            if BINUTILS_VERSION_2_22
-       default "2.23.1"          if BINUTILS_VERSION_2_23_1
-       default "2.20.1"          if avr32
-       default "2.22"
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1 || avr32
+       default "linaro"          if BINUTILS_VERSION_LINARO
+       default "linaro"