X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/36fa7f266cc12cf3296e845a595c4d086eca6718..658e7e8470b6d851fb4e119dd7de7a7952e57211:/toolchain/binutils/Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 27a583d8a..bfbb8b715 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,7 +2,7 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if (avr32 || ubicom32)
+	default BINUTILS_VERSION_2_19_1 if ubicom32
 	default BINUTILS_VERSION_2_20_1
 	help
 	  Select the version of binutils you wish to use.
@@ -10,16 +10,19 @@ choice
 	config BINUTILS_VERSION_2_19_1
 		bool "binutils 2.19.1"
 
-        config BINUTILS_VERSION_2_20_1
-                depends !avr32
-                depends !ubicom32
-                bool "binutils 2.20.1"
+	config BINUTILS_VERSION_2_20_1
+		depends !ubicom32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_2_21
+		depends !ubicom32
+		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"
 
 endchoice
 
@@ -35,6 +38,7 @@ config BINUTILS_VERSION
 	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.19.1+cs"       if BINUTILS_VERSION_CS
-	default "2.19.1"          if (avr32 || ubicom32)
+	default "2.21"            if BINUTILS_VERSION_2_21
+	default "2.21.1"          if BINUTILS_VERSION_2_21_1
+	default "2.19.1"          if ubicom32
 	default "2.20.1"