X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=8d912231f80b123eb3da9274dce0f273b264ea69;hb=75068b96cd2826bb892dee17ec4b576acec6bf82;hp=90cfc346eaf3827bd3b8391e100a9f69db913e60;hpb=154efb3544759eaefd2f469e2f6a16455e31b3c3;p=openwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 90cfc346ea..8d912231f8 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,34 +2,12 @@
 
 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
 	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
-		bool "binutils 2.20.1"
-
-	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_2_23_1
-		depends !ubicom32 || (ubicom32 && BROKEN)
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.23.1"
+	config BINUTILS_VERSION_LINARO
+		bool "Linaro binutils 2.24"
 
 endchoice
 
@@ -43,11 +21,5 @@ 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.1"          if BINUTILS_VERSION_2_21_1
-	default "2.22"            if BINUTILS_VERSION_2_22
-	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
-	default "2.19.1"          if ubicom32
-	default "2.20.1"          if avr32
-	default "2.22"
+	default "linaro"          if BINUTILS_VERSION_LINARO
+	default "linaro"