X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=8c90597091527b729f185d22c27b9c5ec589aadd;hp=50ee615a04a75b376d227dc693311d8743020d65;hb=b937cbf1aed0f2af2637e00616c0bca8481a3370;hpb=0ffbe196d54476d5fe91c5f5d76b060cd42d5403

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 50ee615a04..8c90597091 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,8 +2,8 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if ubicom32
-	default BINUTILS_VERSION_2_20_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.
 
@@ -11,24 +11,21 @@ choice
 		bool "binutils 2.19.1"
 
 	config BINUTILS_VERSION_2_20_1
-		depends !ubicom32
+		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
-		depends !avr32
+		depends !avr32 || (avr32 && BROKEN)
 		bool "binutils 2.22"
 
+	config BINUTILS_VERSION_2_23_1
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.23.1"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -43,8 +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.20.1"
+	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
+	default "2.20.1"          if avr32
+	default "2.22"