X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=e2d0d20be6b29ceaef64ea642756dc3535ff3a74;hb=ca4cdad8eb6bf20e766daed0b930ea456b64b6d0;hp=6b0791deb318dfaa15bd8c8f4f9fb3e8792c0cab;hpb=86dc5a474935ce5a6415ce4fe3f19f99cb226a35;p=openwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 6b0791deb3..e2d0d20be6 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,17 +2,27 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	default BINUTILS_VERSION_2_19_1
+	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_18
-		bool "binutils 2.18"
+	config BINUTILS_VERSION_2_20_1
+		depends on avr32
+		bool "binutils 2.20.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"
+
+	config BINUTILS_VERSION_LINARO
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "Linaro binutils 2.23.2"
 
-	config BINUTILS_VERSION_2_19_1
-		depends !TARGET_avr32
-		bool "binutils 2.19.1"
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -25,7 +35,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.18"            if BINUTILS_VERSION_2_18
-	default "2.19.1"          if BINUTILS_VERSION_2_19_1
-	default "2.18"            if TARGET_avr32
-	default "2.19.1"
+	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 "linaro"          if BINUTILS_VERSION_LINARO
+	default "2.20.1"          if avr32
+	default "2.22"