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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 598029f1d..bfbb8b715 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,21 +2,33 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_17
+	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 BINUTILS_VERSION_2_16_1
-		bool "binutils 2.16.1"
+	config BINUTILS_VERSION_2_19_1
+		bool "binutils 2.19.1"
 
-	config BINUTILS_VERSION_2_17
-		bool "binutils 2.17"
+	config BINUTILS_VERSION_2_20_1
+		depends !ubicom32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_2_21
+		depends !ubicom32
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21"
+
+	config BINUTILS_VERSION_2_21_1
+		depends !ubicom32
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21.1"
 
 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....
@@ -24,8 +36,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 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.17"
-
-
+	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"