X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2f006aa5e8a74e2dd224f5e9b90d36c79651fd66..01af86f6ed6841ac71090e7c5a2d0edb00b69324:/toolchain/binutils/Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index d1d62955d..bfbb8b715 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,66 +1,44 @@
 # Choose binutils version.
 
-comment "Binutils Options"
-
 choice
-	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_15_91_0_2
+	prompt "Binutils Version" if TOOLCHAINOPTS
+	default BINUTILS_VERSION_2_19_1 if ubicom32
+	default BINUTILS_VERSION_2_20_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_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_19_1
+		bool "binutils 2.19.1"
 
-	config BR2_BINUTILS_VERSION_2_15_90_0_3
-		bool "binutils 2.15.90.0.3"
+	config BINUTILS_VERSION_2_20_1
+		depends !ubicom32
+		bool "binutils 2.20.1"
 
-	config BR2_BINUTILS_VERSION_2_15_91_0_1
-		bool "binutils 2.15.91.0.1"
+	config BINUTILS_VERSION_2_21
+		depends !ubicom32
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21"
 
-	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"
-
-	config BR2_BINUTILS_VERSION_2_15_94_0_1
-		bool "binutils 2.15.94.0.1"
-
-	config BR2_BINUTILS_VERSION_2_15_94_0_2
-		bool "binutils 2.15.94.0.2"
+	config BINUTILS_VERSION_2_21_1
+		depends !ubicom32
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21.1"
 
 endchoice
 
-config BR2_BINUTILS_VERSION
+config EXTRA_BINUTILS_CONFIG_OPTIONS
+	string
+	prompt "Additional binutils configure options" if TOOLCHAINOPTS
+	default ""
+	help
+	    Any additional binutils options you may want to include....
+
+config 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
+	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"            if BINUTILS_VERSION_2_21
+	default "2.21.1"          if BINUTILS_VERSION_2_21_1
+	default "2.19.1"          if ubicom32
+	default "2.20.1"