X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=7b5127b46f3575228269bfbb268763afedf0a964;hb=6dfce04b55851097a9f802df52f1e705364f812b;hp=167ca64f8fa61ab786db8cfa0ce5f09e6d19ed03;hpb=9cb02dd35c4644520db9f8f0d04ab009a291b5ea;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 167ca64f8f..7b5127b46f 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,30 +2,37 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	default BINUTILS_VERSION_2_18 if TARGET_ppc44x || TARGET_ppc40x
 	default BINUTILS_VERSION_2_19_1
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_17
-		bool "binutils 2.17"
-
 	config BINUTILS_VERSION_2_18
+		depends !ubicom32
 		bool "binutils 2.18"
 
-	config BINUTILS_VERSION_2_19
-		depends !TARGET_avr32
-		bool "binutils 2.19"
-
 	config BINUTILS_VERSION_2_19_1
-		depends !TARGET_avr32
 		bool "binutils 2.19.1"
+
+	config BINUTILS_VERSION_2_20
+		depends !avr32
+		depends !ubicom32
+		bool "binutils 2.20"
+        config BINUTILS_VERSION_2_20_1
+                depends !avr32
+                depends !ubicom32
+                bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_CS
+		depends !avr32
+		depends !ubicom32
+		depends BROKEN
+		bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+
 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....
@@ -33,10 +40,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.17"            if BINUTILS_VERSION_2_17
 	default "2.18"            if BINUTILS_VERSION_2_18
-	default "2.19"            if BINUTILS_VERSION_2_19
 	default "2.19.1"          if BINUTILS_VERSION_2_19_1
-	default "2.18"            if TARGET_avr32
-	default "2.18"            if TARGET_ppc44x || TARGET_ppc40x
+	default "2.20"            if BINUTILS_VERSION_2_20
+	default "2.20.1"          if BINUTILS_VERSION_2_20_1
+	default "2.19.1+cs"       if BINUTILS_VERSION_CS
 	default "2.19.1"