X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=2303888f126d35feea9f7e037400c2b0276a417b;hb=69630140ec8542c955f5be4268ff4e53c6646f89;hp=2ce5de361867353bf0bfa921fd7ada716e875182;hpb=bd73e0a85d79885d31cbae660a8964ef3635a49e;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 2ce5de3618..2303888f12 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,35 +2,21 @@
 
 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_USE_VERSION_2_34
 	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_USE_VERSION_2_32
+		bool "Binutils 2.32"
+		select BINUTILS_VERSION_2_32
 
-	config BINUTILS_VERSION_2_20_1
-		depends avr32
-		bool "binutils 2.20.1"
-
-	config BINUTILS_VERSION_2_21
-		depends !ubicom32
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.21"
-
-	config BINUTILS_VERSION_2_21_1
-		depends !ubicom32
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.21.1"
-
-	config BINUTILS_VERSION_2_22
-		depends !ubicom32
-		depends !avr32
-		bool "binutils 2.22"
+	config BINUTILS_USE_VERSION_2_34
+		bool "Binutils 2.34"
+		select BINUTILS_VERSION_2_34
 
+	config BINUTILS_USE_VERSION_2_35
+		bool "Binutils 2.35"
+		select BINUTILS_VERSION_2_35
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -39,15 +25,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.19.1"          if BINUTILS_VERSION_2_19_1
-	default "2.20.1"          if BINUTILS_VERSION_2_20_1
-	default "2.21"            if BINUTILS_VERSION_2_21
-	default "2.21.1"          if BINUTILS_VERSION_2_21_1
-	default "2.22"            if BINUTILS_VERSION_2_22
-	default "2.19.1"          if ubicom32
-	default "2.20.1"          if avr32
-	default "2.22"