X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=03e9b811f5fb65c68df050c0e8ade5ed13373e35;hb=3fb280f835ac84bb24a69731a0e5f2c42b297568;hp=4dce6ca126d0620c22d011902815495f903df15c;hpb=b466822eee105ec1e0f55ff38430880b2f438ca3;p=openwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 4dce6ca126..03e9b811f5 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,25 +2,28 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	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_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_22
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.22"
 
-	config BINUTILS_VERSION_2_19
-		bool "binutils 2.19"
+	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....
@@ -28,8 +31,8 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.17"            if BINUTILS_VERSION_2_17
-	default "2.18"            if BINUTILS_VERSION_2_18
-	default "2.19"            if BINUTILS_VERSION_2_19
-	default "2.18"            if TARGET_avr32
-	default "2.17"
+	default "2.20.1"          if BINUTILS_VERSION_2_20_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"