X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/46e1f147762e57a03c4bb0bfc4ea14a7610063e6..fa56e63d66bcc7271514f8da960cd2441a73c8a7:/toolchain/binutils/Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 856308061..1e21ecbb6 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,66 +1,36 @@
 # Choose binutils version.
 
-comment "Binutils Options"
-
 choice
-	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_14_90_0_8
+	prompt "Binutils Version" if TOOLCHAINOPTS
+	default BINUTILS_VERSION_2_17
 	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_90_0_1_1
-		bool "binutils 2.15.90.0.1.1"
-
-	config BR2_BINUTILS_VERSION_2_15_90_0_2
-		bool "binutils 2.15.90.0.2"
+	config BINUTILS_VERSION_2_16_1
+		bool "binutils 2.16.1"
 
-	config BR2_BINUTILS_VERSION_2_15_90_0_3
-		bool "binutils 2.15.90.0.3"
+	config BINUTILS_VERSION_2_17
+		bool "binutils 2.17"
 
-	config BR2_BINUTILS_VERSION_2_15_91_0_1
-		bool "binutils 2.15.91.0.1"
+	config BINUTILS_VERSION_2_18
+		bool "binutils 2.18"
+		depends !TARGET_avr32
 
-	config BR2_BINUTILS_VERSION_2_15_91_0_2
-		bool "binutils 2.15.91.0.2"
-
-	config BR2_BINUTILS_VERSION_2_15_92_0_2
-		bool "binutils 2.15.92.0.2"
+endchoice
 
-	config BR2_BINUTILS_VERSION_2_15_94_0_1
-		bool "binutils 2.15.94.0.1"
+config EXTRA_BINUTILS_CONFIG_OPTIONS
+	string
+	prompt "Additional binutils options" if TOOLCHAINOPTS
+	default ""
+	help
+	    Any additional binutils options you may want to include....
 
-	config BR2_BINUTILS_VERSION_2_15_94_0_2
-		bool "binutils 2.15.94.0.2"
+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"
 
-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