X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=e8f1b8ff34887a8c393d760891250eff76b9b201;hp=a73ca39b12d6b14bf247e9b8804e6881e96146c9;hb=cac6e3495f74f87646f4d177eb2c978feb5d3fdd;hpb=663f3dca935c45bc6df8f5e44ccd8720752659ed

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index a73ca39b12..e8f1b8ff34 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,24 +2,35 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_17
+	default BINUTILS_VERSION_2_20_1 if avr32
+	default BINUTILS_VERSION_2_22 if !avr32
 	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 on avr32
+		bool "binutils 2.20.1"
 
-	config BINUTILS_VERSION_2_18
-		bool "binutils 2.18"
+	config BINUTILS_VERSION_2_21_1
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21.1"
+
+	config BINUTILS_VERSION_2_22
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.22"
+
+	config BINUTILS_VERSION_2_23_1
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.23.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....
@@ -27,9 +38,10 @@ 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.18"            if BINUTILS_VERSION_2_18
-	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.1"          if BINUTILS_VERSION_2_21_1
+	default "2.22"            if BINUTILS_VERSION_2_22
+	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
+	default "2.20.1"          if avr32
+	default "2.22"