X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/86dc5a474935ce5a6415ce4fe3f19f99cb226a35..663ce9a3a66ad4693a38737e8a75790d98933d88:/toolchain/binutils/Config.in?ds=sidebyside

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 6b0791deb..23f7de7f8 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,17 +2,35 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	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
-		bool "binutils 2.18"
-
 	config BINUTILS_VERSION_2_19_1
-		depends !TARGET_avr32
+		depends ubicom32
 		bool "binutils 2.19.1"
+
+	config BINUTILS_VERSION_2_20_1
+		depends avr32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_2_21
+		depends !ubicom32
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21"
+
+	config BINUTILS_VERSION_2_21_1
+		depends !ubicom32
+		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
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -25,7 +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.18"            if TARGET_avr32
-	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"