X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=38df455818b54b6421d20c690a41ee3468071c0b;hb=76bf68fa52221173451d172511228fef091a1f68;hp=23f7de7f838c49c78af40657b1808081668c4ed9;hpb=3c365cc72d0c29cbd7e1381d4c338beb4339833a;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 23f7de7f83..38df455818 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,34 +2,18 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if ubicom32
 	default BINUTILS_VERSION_2_20_1 if avr32
-	default BINUTILS_VERSION_2_22
+	default BINUTILS_VERSION_LINARO if !avr32
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_19_1
-		depends ubicom32
-		bool "binutils 2.19.1"
-
 	config BINUTILS_VERSION_2_20_1
-		depends avr32
+		depends on avr32
 		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"
-
-	config BINUTILS_VERSION_2_22
-		depends !ubicom32 || (ubicom32 && BROKEN)
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.22"
+	config BINUTILS_VERSION_LINARO
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "Linaro binutils 2.24"
 
 endchoice
 
@@ -43,11 +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.21"            if BINUTILS_VERSION_2_21
-	default "2.21.1"          if BINUTILS_VERSION_2_21_1
-	default "2.22"            if BINUTILS_VERSION_2_22
-	default "2.19.1"          if ubicom32
-	default "2.20.1"          if avr32
-	default "2.22"
+	default "2.20.1"          if BINUTILS_VERSION_2_20_1 || avr32
+	default "linaro"          if BINUTILS_VERSION_LINARO
+	default "linaro"