binutils: switch to version 2.25.1 by default

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index a73ca39b12d6b14bf247e9b8804e6881e96146c9..c32f43cdd4657296e1371b7546f85391acfda81d 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,34 +2,31 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_17
+       default BINUTILS_USE_VERSION_2_25_1 if !arc
+       default BINUTILS_USE_VERSION_2_23_ARC if arc

        help
          Select the version of binutils you wish to use.
 
        help
          Select the version of binutils you wish to use.
 

-       config BINUTILS_VERSION_2_16_1
-               bool "binutils 2.16.1"
+       config BINUTILS_USE_VERSION_2_24_LINARO
+               depends on !arc
+               bool "Linaro binutils 2.24"
+               select BINUTILS_VERSION_2_24_LINARO

 
 

-       config BINUTILS_VERSION_2_17
-               bool "binutils 2.17"
+       config BINUTILS_USE_VERSION_2_25_1
+               depends on !arc
+               bool "Binutils 2.25.1"
+               select BINUTILS_VERSION_2_25_1

 
 

-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
+       config BINUTILS_USE_VERSION_2_23_ARC
+               depends on arc
+               bool "ARC binutils 2.23"
+               select BINUTILS_VERSION_2_23_ARC

 
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string
 
 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....
        default ""
        help
            Any additional binutils options you may want to include....

-
-config BINUTILS_VERSION
-       string
-       prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-       default "2.16.1"          if BINUTILS_VERSION_2_16_1
-       default "2.17"            if BINUTILS_VERSION_2_17
-       default "2.18"            if BINUTILS_VERSION_2_18
-       default "2.17"
-
-