X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=685e89be96daa770c34ea01e0c71b9da3bc8224c;hb=8568dcd931c53ba177f1c9601e9706d95d015062;hp=90cfc346eaf3827bd3b8391e100a9f69db913e60;hpb=cf440ae7169f9095ea2089269d894a8a60de3161;p=openwrt%2Fstaging%2Fstintel.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 90cfc346ea..685e89be96 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,34 +2,24 @@
 
 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_31_1 if !arc
+	default BINUTILS_USE_VERSION_2_32 if arc
 	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_29_1
+		depends on !arc
+		bool "Binutils 2.29.1"
+		select BINUTILS_VERSION_2_29_1
 
-	config BINUTILS_VERSION_2_20_1
-		depends avr32
-		bool "binutils 2.20.1"
+	config BINUTILS_USE_VERSION_2_31_1
+		depends on !arc
+		bool "Binutils 2.31.1"
+		select BINUTILS_VERSION_2_31_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_USE_VERSION_2_32
+		bool "Binutils 2.32"
+		select BINUTILS_VERSION_2_32
 
 endchoice
 
@@ -39,15 +29,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.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"