X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=38df455818b54b6421d20c690a41ee3468071c0b;hp=be0605903307b309f85dc38d78868c7d75a63e10;hb=76bf68fa52221173451d172511228fef091a1f68;hpb=74ecb8f3c6ada63e6e8a0988b8326ed573c70fe8

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index be06059033..38df455818 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,18 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if ubicom32
-	default BINUTILS_VERSION_2_20_1
+	default BINUTILS_VERSION_2_20_1 if avr32
+	default BINUTILS_VERSION_LINARO if !avr32
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_19_1
-		bool "binutils 2.19.1"
+	config BINUTILS_VERSION_2_20_1
+		depends on avr32
+		bool "binutils 2.20.1"
 
-        config BINUTILS_VERSION_2_20_1
-                depends !ubicom32
-                bool "binutils 2.20.1"
-
-	config BINUTILS_VERSION_CS
-		depends !avr32
-		depends !ubicom32
-		depends BROKEN
-		bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+	config BINUTILS_VERSION_LINARO
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "Linaro binutils 2.24"
 
 endchoice
 
@@ -32,8 +27,6 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	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.19.1+cs"       if BINUTILS_VERSION_CS
-	default "2.19.1"          if ubicom32
-	default "2.20.1"
+	default "2.20.1"          if BINUTILS_VERSION_2_20_1 || avr32
+	default "linaro"          if BINUTILS_VERSION_LINARO
+	default "linaro"