X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=8d912231f80b123eb3da9274dce0f273b264ea69;hp=ea84619b4ec550313dd4cb76880562aab23b074c;hb=52907ecd6c003a38feb908d45d291e5626c6f396;hpb=3247fd93bbe20abcfc18a9eb645a5ad6cac311ce

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index ea84619b4e..8d912231f8 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_18 if TARGET_avr32
-	default BINUTILS_VERSION_2_18 if TARGET_ppc44x
-	default BINUTILS_VERSION_2_19_1
+	default BINUTILS_VERSION_LINARO
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_18
-		bool "binutils 2.18"
+	config BINUTILS_VERSION_LINARO
+		bool "Linaro binutils 2.24"
 
-	config BINUTILS_VERSION_2_19_1
-		depends !TARGET_avr32
-		bool "binutils 2.19.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....
@@ -26,8 +21,5 @@ 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.18"            if TARGET_ppc44x
-	default "2.19.1"
+	default "linaro"          if BINUTILS_VERSION_LINARO
+	default "linaro"