X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/14632568daae05e52df5d9b18b18bcd30010fb59..deb8dba13ccbf04cbb466441480f0b6f7ae16b32:/toolchain/binutils/Config.in?ds=inline

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index c9a1eb638..27a583d8a 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,18 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if avr32
-	default BINUTILS_VERSION_2_19_1
+	default BINUTILS_VERSION_2_19_1 if (avr32 || ubicom32)
+	default BINUTILS_VERSION_2_20_1
 	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 !avr32
+                depends !ubicom32
+                bool "binutils 2.20.1"
 
 	config BINUTILS_VERSION_CS
 		depends !avr32
@@ -38,9 +33,8 @@ 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.20.1"          if BINUTILS_VERSION_2_20_1
 	default "2.19.1+cs"       if BINUTILS_VERSION_CS
-	default "2.18"            if avr32
-	default "2.19.1"
+	default "2.19.1"          if (avr32 || ubicom32)
+	default "2.20.1"