X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=e8f1b8ff34887a8c393d760891250eff76b9b201;hb=96bb7c123b8b47dfc43002edf4a52aceb410f852;hp=c9a1eb638a687f1bf6425544d31f736ec9707e06;hpb=9df6b68bfa3ee926e746a7ada73cb96775208708;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index c9a1eb638a..e8f1b8ff34 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,29 +2,29 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if avr32
-	default BINUTILS_VERSION_2_19_1
+	default BINUTILS_VERSION_2_20_1 if avr32
+	default BINUTILS_VERSION_2_22 if !avr32
 	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 !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 on avr32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_2_21_1
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21.1"
+
+	config BINUTILS_VERSION_2_22
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.22"
 
-	config BINUTILS_VERSION_CS
-		depends !avr32
-		depends !ubicom32
-		depends BROKEN
-		bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+	config BINUTILS_VERSION_2_23_1
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.23.1"
 
 endchoice
 
@@ -38,9 +38,10 @@ 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.18"            if avr32
-	default "2.19.1"
+	default "2.20.1"          if BINUTILS_VERSION_2_20_1
+	default "2.21.1"          if BINUTILS_VERSION_2_21_1
+	default "2.22"            if BINUTILS_VERSION_2_22
+	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
+	default "2.20.1"          if avr32
+	default "2.22"