X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=toolchain%2Fbinutils%2FConfig.in;h=8455d843d2806aeb73396fe67649c5b154e76cff;hb=9b965d3b71e526ae8aeb345510bc1389e567e463;hp=03e9b811f5fb65c68df050c0e8ade5ed13373e35;hpb=6260e6ef480af162cd2f62f2aeeba639f29727ff;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 03e9b811f5..8455d843d2 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,22 +2,25 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_20_1 if avr32
-	default BINUTILS_VERSION_2_22 if !avr32
+	default BINUTILS_USE_VERSION_2_30 if !arc
+	default BINUTILS_USE_VERSION_2_29_ARC if arc
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_20_1
-		depends on avr32
-		bool "binutils 2.20.1"
+	config BINUTILS_USE_VERSION_2_29_ARC
+		depends on arc
+		bool "ARC binutils 2.29"
+		select BINUTILS_VERSION_2_29_ARC
 
-	config BINUTILS_VERSION_2_22
-		depends on !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.22"
+	config BINUTILS_USE_VERSION_2_29_1
+		depends on !arc
+		bool "Binutils 2.29.1"
+		select BINUTILS_VERSION_2_29_1
 
-	config BINUTILS_VERSION_2_23_1
-		depends on !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.23.1"
+	config BINUTILS_USE_VERSION_2_30
+		depends on !arc
+		bool "Binutils 2.30"
+		select BINUTILS_VERSION_2_30
 
 endchoice
 
@@ -27,12 +30,3 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 	default ""
 	help
 	    Any additional binutils options you may want to include....
-
-config BINUTILS_VERSION
-	string
-	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.20.1"          if BINUTILS_VERSION_2_20_1
-	default "2.22"            if BINUTILS_VERSION_2_22
-	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
-	default "2.20.1"          if avr32
-	default "2.22"