X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/021e6aa5f3691fe6fdf04a406a642575f46f284a..d8c92115a260f966ed4efc8043887bfca6e3d8d3:/toolchain/binutils/Config.in?ds=sidebyside

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 56b29c3ec..fb81d13e8 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,39 +2,37 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_16_1
+	default BINUTILS_VERSION_2_19_1 if ubicom32
+	default BINUTILS_VERSION_2_20_1
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_15_94_0_2
-		bool "binutils 2.15.94.0.2"
+	config BINUTILS_VERSION_2_19_1
+		bool "binutils 2.19.1"
 
-	config BINUTILS_VERSION_2_16_1
-		bool "binutils 2.16.1"
+	config BINUTILS_VERSION_2_20_1
+		depends !ubicom32
+		bool "binutils 2.20.1"
 
-	config BINUTILS_VERSION_2_16_90_0_3
-		bool "binutils 2.16.90.0.3"
-
-	config BINUTILS_VERSION_2_16_91_0_1
-		bool "binutils 2.16.91.0.1"
-
-	config BINUTILS_VERSION_2_16_91_0_2
-		bool "binutils 2.16.91.0.2"
-
-	config BINUTILS_VERSION_2_16_91_0_6
-		bool "binutils 2.16.91.0.6"
+	config BINUTILS_VERSION_2_21
+		depends !ubicom32
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21"
 
 endchoice
 
+config EXTRA_BINUTILS_CONFIG_OPTIONS
+	string
+	prompt "Additional binutils configure options" if TOOLCHAINOPTS
+	default ""
+	help
+	    Any additional binutils options you may want to include....
+
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.15.94.0.2"     if BINUTILS_VERSION_2_15_94_0_2
-	default "2.16.1"          if BINUTILS_VERSION_2_16_1
-	default "2.16.90.0.3"     if BINUTILS_VERSION_2_16_90_0_3
-	default "2.16.91.0.1"     if BINUTILS_VERSION_2_16_91_0_1
-	default "2.16.91.0.2"     if BINUTILS_VERSION_2_16_91_0_2
-	default "2.16.91.0.6"     if BINUTILS_VERSION_2_16_91_0_6
-	default "2.16.1"
-
-
+	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.19.1"          if ubicom32
+	default "2.20.1"