switch default binutils to 2.16.1

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

diff --git a/openwrt/toolchain/binutils/Config.in b/openwrt/toolchain/binutils/Config.in
index d1d6295..2c0b4f8 100644 (file)
--- a/openwrt/toolchain/binutils/Config.in
+++ b/openwrt/toolchain/binutils/Config.in
@@ -1,66 +1,53 @@
 # Choose binutils version.
 
-comment "Binutils Options"
+if CONFIG_DEVEL
+       comment "Binutils Options"
+endif
 
 choice
-       prompt "Binutils Version"
-       default BR2_BINUTILS_VERSION_2_15_91_0_2
+       prompt "Binutils Version" if CONFIG_DEVEL
+       default BR2_BINUTILS_VERSION_2_16_1
        help
          Select the version of binutils you wish to use.
 
-       config BR2_BINUTILS_VERSION_2_14_90_0_6
-               bool "binutils 2.14.90.0.6"
-
-       config BR2_BINUTILS_VERSION_2_14_90_0_7
-               bool "binutils 2.14.90.0.7"
-
-       config BR2_BINUTILS_VERSION_2_14_90_0_8
-               bool "binutils 2.14.90.0.8"
-
        config BR2_BINUTILS_VERSION_2_15
                bool "binutils 2.15"
 
-       config BR2_BINUTILS_VERSION_2_15_90_0_1
-               bool "binutils 2.15.90.0.1"
+       config BR2_BINUTILS_VERSION_2_15_94_0_2
+               bool "binutils 2.15.94.0.2"
 
-       config BR2_BINUTILS_VERSION_2_15_90_0_1_1
-               bool "binutils 2.15.90.0.1.1"
+       config BR2_BINUTILS_VERSION_2_15_94_0_2_2
+               bool "binutils 2.15.94.0.2.2"
 
-       config BR2_BINUTILS_VERSION_2_15_90_0_2
-               bool "binutils 2.15.90.0.2"
+       config BR2_BINUTILS_VERSION_2_15_97
+               bool "binutils 2.15.97"
 
-       config BR2_BINUTILS_VERSION_2_15_90_0_3
-               bool "binutils 2.15.90.0.3"
+       config BR2_BINUTILS_VERSION_2_16
+               bool "binutils 2.16"
 
-       config BR2_BINUTILS_VERSION_2_15_91_0_1
-               bool "binutils 2.15.91.0.1"
+       config BR2_BINUTILS_VERSION_2_16_1
+               bool "binutils 2.16.1"
 
-       config BR2_BINUTILS_VERSION_2_15_91_0_2
-               bool "binutils 2.15.91.0.2"
+       config BR2_BINUTILS_VERSION_2_16_90_0_3
+               bool "binutils 2.16.90.0.3"
 
-       config BR2_BINUTILS_VERSION_2_15_92_0_2
-               bool "binutils 2.15.92.0.2"
+       config BR2_BINUTILS_VERSION_2_16_91_0_1
+               bool "binutils 2.16.91.0.1"
 
-       config BR2_BINUTILS_VERSION_2_15_94_0_1
-               bool "binutils 2.15.94.0.1"
+       config BR2_BINUTILS_VERSION_2_16_91_0_2
+               bool "binutils 2.16.91.0.2"
 
-       config BR2_BINUTILS_VERSION_2_15_94_0_2
-               bool "binutils 2.15.94.0.2"
 
 endchoice
 
 config BR2_BINUTILS_VERSION
        string
-       default "2.14.90.0.6"     if BR2_BINUTILS_VERSION_2_14_90_0_6
-       default "2.14.90.0.7"     if BR2_BINUTILS_VERSION_2_14_90_0_7
-       default "2.14.90.0.8"     if BR2_BINUTILS_VERSION_2_14_90_0_8
        default "2.15"            if BR2_BINUTILS_VERSION_2_15
-       default "2.15.90.0.1"     if BR2_BINUTILS_VERSION_2_15_90_0_1
-       default "2.15.90.0.0.1.1" if BR2_BINUTILS_VERSION_2_15_90_0_1_1
-       default "2.15.90.0.2"     if BR2_BINUTILS_VERSION_2_15_90_0_2
-       default "2.15.90.0.3"     if BR2_BINUTILS_VERSION_2_15_90_0_3
-       default "2.15.91.0.1"     if BR2_BINUTILS_VERSION_2_15_91_0_1
-       default "2.15.91.0.2"     if BR2_BINUTILS_VERSION_2_15_91_0_2
-       default "2.15.92.0.2"     if BR2_BINUTILS_VERSION_2_15_92_0_2
-       default "2.15.94.0.1"     if BR2_BINUTILS_VERSION_2_15_94_0_1
        default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
+       default "2.15.94.0.2.2"   if BR2_BINUTILS_VERSION_2_15_94_0_2_2
+       default "2.15.97"         if BR2_BINUTILS_VERSION_2_15_97
+       default "2.16"            if BR2_BINUTILS_VERSION_2_16
+       default "2.16.1"          if BR2_BINUTILS_VERSION_2_16_1 || !CONFIG_DEVEL
+       default "2.16.90.0.3"     if BR2_BINUTILS_VERSION_2_16_90_0_3
+       default "2.16.91.0.1"     if BR2_BINUTILS_VERSION_2_16_91_0_1
+       default "2.16.91.0.2"     if BR2_BINUTILS_VERSION_2_16_91_0_2