X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0184bd932705d466504465b6c0de8709dd492bd8..aea2ea872168ca167fb5c4e68d60466a4516f42e:/toolchain/binutils/Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 7c54e784b..23f7de7f8 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,27 +2,34 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1
+	default BINUTILS_VERSION_2_19_1 if ubicom32
+	default BINUTILS_VERSION_2_20_1 if avr32
+	default BINUTILS_VERSION_2_22
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_18
-		depends !ubicom32
-		bool "binutils 2.18"
-
 	config BINUTILS_VERSION_2_19_1
+		depends ubicom32
 		bool "binutils 2.19.1"
 
-	config BINUTILS_VERSION_2_20
-		depends !avr32
+	config BINUTILS_VERSION_2_20_1
+		depends avr32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_2_21
 		depends !ubicom32
-		bool "binutils 2.20"
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21"
 
-	config BINUTILS_VERSION_CS
-		depends !avr32
+	config BINUTILS_VERSION_2_21_1
 		depends !ubicom32
-		depends BROKEN
-		bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+		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"
 
 endchoice
 
@@ -36,8 +43,11 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.18"            if BINUTILS_VERSION_2_18
 	default "2.19.1"          if BINUTILS_VERSION_2_19_1
-	default "2.20"            if BINUTILS_VERSION_2_20
-	default "2.19.1+cs"       if BINUTILS_VERSION_CS
-	default "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"