X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b0c913d6094b59472ef2b7a40d344006e1cfceb5..2ea7b39338d968435ac617363fbeda021bfae67c:/toolchain/binutils/Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 207b2a05a..fb81d13e8 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -10,19 +10,14 @@ choice
 	config BINUTILS_VERSION_2_19_1
 		bool "binutils 2.19.1"
 
-        config BINUTILS_VERSION_2_20_1
-                depends !ubicom32
-                bool "binutils 2.20.1"
-
-        config BINUTILS_VERSION_2_21
-                depends !ubicom32
-                bool "binutils 2.21"
+	config BINUTILS_VERSION_2_20_1
+		depends !ubicom32
+		bool "binutils 2.20.1"
 
-	config BINUTILS_VERSION_CS
-		depends !avr32
+	config BINUTILS_VERSION_2_21
 		depends !ubicom32
-		depends BROKEN
-		bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21"
 
 endchoice
 
@@ -39,6 +34,5 @@ config BINUTILS_VERSION
 	default "2.19.1"          if BINUTILS_VERSION_2_19_1
 	default "2.20.1"          if BINUTILS_VERSION_2_20_1
 	default "2.21"            if BINUTILS_VERSION_2_21
-	default "2.19.1+cs"       if BINUTILS_VERSION_CS
 	default "2.19.1"          if ubicom32
 	default "2.20.1"