X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=544f62bdc19a290d55d3a813b0c05979ae40f23e;hb=62de43971065751431c7781db9b4cabaf7bf366b;hp=89e351b6c97f5b69d87f84ec208c0cbb1acee1db;hpb=38ab317f9ef248c64595082593860b1ab18aa90f;p=openwrt.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 89e351b6c9..544f62bdc1 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,26 +2,29 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	default BINUTILS_VERSION_2_17
+	default BINUTILS_VERSION_2_18 if avr32
+	default BINUTILS_VERSION_2_19_1
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_17
-		bool "binutils 2.17"
-
 	config BINUTILS_VERSION_2_18
 		bool "binutils 2.18"
 
-	config BINUTILS_VERSION_2_19
-		depends !TARGET_avr32
-		bool "binutils 2.19"
+	config BINUTILS_VERSION_2_19_1
+		depends !avr32
+		bool "binutils 2.19.1"
+
+	config BINUTILS_VERSION_CS
+		depends !avr32
+		depends !ubicom32
+		depends BROKEN
+		bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
 
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
 	string
-	prompt "Additional binutils options" if TOOLCHAINOPTS
+	prompt "Additional binutils configure options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional binutils options you may want to include....
@@ -29,9 +32,8 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	default "2.17"            if BINUTILS_VERSION_2_17
 	default "2.18"            if BINUTILS_VERSION_2_18
-	default "2.19"            if BINUTILS_VERSION_2_19
-	default "2.18"            if TARGET_avr32
-	default "2.18"            if TARGET_ppc44x || TARGET_ppc40x
-	default "2.17"
+	default "2.19.1"          if BINUTILS_VERSION_2_19_1
+	default "2.19.1+cs"       if BINUTILS_VERSION_CS
+	default "2.18"            if avr32
+	default "2.19.1"