X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=e2d0d20be6b29ceaef64ea642756dc3535ff3a74;hb=78678ad335c7261ad828ac621fbd646f3b4c7767;hp=8c90597091527b729f185d22c27b9c5ec589aadd;hpb=b937cbf1aed0f2af2637e00616c0bca8481a3370;p=openwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 8c90597091..e2d0d20be6 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -7,25 +7,22 @@ choice
 	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 avr32
+		depends on avr32
 		bool "binutils 2.20.1"
 
-	config BINUTILS_VERSION_2_21_1
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.21.1"
-
 	config BINUTILS_VERSION_2_22
-		depends !avr32 || (avr32 && BROKEN)
+		depends on !avr32 || (avr32 && BROKEN)
 		bool "binutils 2.22"
 
 	config BINUTILS_VERSION_2_23_1
-		depends !avr32 || (avr32 && BROKEN)
+		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"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -38,10 +35,9 @@ 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 "linaro"          if BINUTILS_VERSION_LINARO
 	default "2.20.1"          if avr32
 	default "2.22"