X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=9b4fe07b7d381c815552c785d86aa8e777609e3e;hp=78746388416b25bec0dc723be10d968cbb447728;hb=28e9c816dc1ea536e8e984854dff9e8cf6260a6d;hpb=a448b8a7b0ab534678d72f0c8f48e9630473fe1b

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 7874638841..9b4fe07b7d 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,40 +1,24 @@
 # Choose binutils version.
 
-if CONFIG_DEVEL
-	comment "Binutils Options"
-endif
-
 choice
-	prompt "Binutils Version" if CONFIG_DEVEL
-	default BR2_BINUTILS_VERSION_2_16_1
+	prompt "Binutils Version" if TOOLCHAINOPTS
+	default BINUTILS_VERSION_2_16_1
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_15_94_0_2
-		bool "binutils 2.15.94.0.2"
-
-	config BR2_BINUTILS_VERSION_2_16_1
+	config BINUTILS_VERSION_2_16_1
 		bool "binutils 2.16.1"
 
-	config BR2_BINUTILS_VERSION_2_16_90_0_3
-		bool "binutils 2.16.90.0.3"
-
-	config BR2_BINUTILS_VERSION_2_16_91_0_1
-		bool "binutils 2.16.91.0.1"
-
-	config BR2_BINUTILS_VERSION_2_16_91_0_2
-		bool "binutils 2.16.91.0.2"
-
-	config BR2_BINUTILS_VERSION_2_16_91_0_6
-		bool "binutils 2.16.91.0.6"
+	config BINUTILS_VERSION_2_17
+		bool "binutils 2.17"
 
 endchoice
 
-config BR2_BINUTILS_VERSION
+config BINUTILS_VERSION
 	string
-	default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
-	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
-	default "2.16.91.0.6"     if BR2_BINUTILS_VERSION_2_16_91_0_6
+	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.16.1"
+
+