X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=e8f1b8ff34887a8c393d760891250eff76b9b201;hp=2ce5de361867353bf0bfa921fd7ada716e875182;hb=cac6e3495f74f87646f4d177eb2c978feb5d3fdd;hpb=1f93aa565e0aa68b1eafdd1c62fd231b46d1984b

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 2ce5de3618..e8f1b8ff34 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,35 +2,30 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if ubicom32
 	default BINUTILS_VERSION_2_20_1 if avr32
-	default BINUTILS_VERSION_2_22
+	default BINUTILS_VERSION_2_22 if !avr32
 	help
 	  Select the version of binutils you wish to use.
 
 	config BINUTILS_VERSION_2_19_1
-		depends ubicom32
 		bool "binutils 2.19.1"
 
 	config BINUTILS_VERSION_2_20_1
-		depends avr32
+		depends on 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)
+		depends on !avr32 || (avr32 && BROKEN)
 		bool "binutils 2.21.1"
 
 	config BINUTILS_VERSION_2_22
-		depends !ubicom32
-		depends !avr32
+		depends on !avr32 || (avr32 && BROKEN)
 		bool "binutils 2.22"
 
+	config BINUTILS_VERSION_2_23_1
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.23.1"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -45,9 +40,8 @@ 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.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.23.1"	  if BINUTILS_VERSION_2_23_1
 	default "2.20.1"          if avr32
 	default "2.22"