X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0f5e566f221459f8293482fbcb54dfca672df927..26d228d7141f06b9f5a1ca271e6abd7d0d20b606:/toolchain/binutils/Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 3a28b6553..7b5127b46 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,22 +2,37 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	default BINUTILS_VERSION_2_17
+	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_1
+		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....
@@ -25,7 +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.18"            if TARGET_avr32
-	default "2.17"
+	default "2.19.1"          if BINUTILS_VERSION_2_19_1
+	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"