X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=c32f43cdd4657296e1371b7546f85391acfda81d;hp=ea84619b4ec550313dd4cb76880562aab23b074c;hb=15aa6d1a164a54a75aaae3656f47e3c692c36c79;hpb=c8f178d61a4a03ad4b5994143f7c2690cd3bad38

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index ea84619b4e..c32f43cdd4 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,32 +2,31 @@
 
 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_USE_VERSION_2_25_1 if !arc
+	default BINUTILS_USE_VERSION_2_23_ARC if arc
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_18
-		bool "binutils 2.18"
+	config BINUTILS_USE_VERSION_2_24_LINARO
+		depends on !arc
+		bool "Linaro binutils 2.24"
+		select BINUTILS_VERSION_2_24_LINARO
+
+	config BINUTILS_USE_VERSION_2_25_1
+		depends on !arc
+		bool "Binutils 2.25.1"
+		select BINUTILS_VERSION_2_25_1
+
+	config BINUTILS_USE_VERSION_2_23_ARC
+		depends on arc
+		bool "ARC binutils 2.23"
+		select BINUTILS_VERSION_2_23_ARC
 
-	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....
-
-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"