X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=8c90597091527b729f185d22c27b9c5ec589aadd;hb=781e7dd18b38c80249f59ef3ae1618766ccfe1c7;hp=9b4fe07b7d381c815552c785d86aa8e777609e3e;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 9b4fe07b7d..8c90597091 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,46 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_16_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.
 
-	config BINUTILS_VERSION_2_16_1
-		bool "binutils 2.16.1"
+	config BINUTILS_VERSION_2_19_1
+		bool "binutils 2.19.1"
 
-	config BINUTILS_VERSION_2_17
-		bool "binutils 2.17"
+	config BINUTILS_VERSION_2_20_1
+		depends avr32
+		bool "binutils 2.20.1"
+
+	config BINUTILS_VERSION_2_21_1
+		depends !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.21.1"
+
+	config BINUTILS_VERSION_2_22
+		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
+	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.16.1"          if BINUTILS_VERSION_2_16_1
-	default "2.17"            if BINUTILS_VERSION_2_17
-	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.1"          if BINUTILS_VERSION_2_21_1
+	default "2.22"            if BINUTILS_VERSION_2_22
+	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
+	default "2.20.1"          if avr32
+	default "2.22"