X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=9ebf52ddde5d25373f9d05a113f7a402aba43a1a;hb=85812e21f9af31b03f0d89f9fa2d9828a7a109c7;hp=167ca64f8fa61ab786db8cfa0ce5f09e6d19ed03;hpb=9cb02dd35c4644520db9f8f0d04ab009a291b5ea;p=librecmc%2Flibrecmc.git

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 167ca64f8f..9ebf52ddde 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,30 +2,32 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_18 if TARGET_avr32
-	default BINUTILS_VERSION_2_18 if TARGET_ppc44x || TARGET_ppc40x
-	default BINUTILS_VERSION_2_19_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_17
-		bool "binutils 2.17"
+	config BINUTILS_VERSION_2_20_1
+		depends on avr32
+		bool "binutils 2.20.1"
 
-	config BINUTILS_VERSION_2_18
-		bool "binutils 2.18"
+	config BINUTILS_VERSION_2_22
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.22"
 
-	config BINUTILS_VERSION_2_19
-		depends !TARGET_avr32
-		bool "binutils 2.19"
+	config BINUTILS_VERSION_2_23_1
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "binutils 2.23.1"
+
+	config BINUTILS_VERSION_LINARO
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "Linaro binutils 2.24"
 
-	config BINUTILS_VERSION_2_19_1
-		depends !TARGET_avr32
-		bool "binutils 2.19.1"
 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....
@@ -33,10 +35,9 @@ 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.19.1"          if BINUTILS_VERSION_2_19_1
-	default "2.18"            if TARGET_avr32
-	default "2.18"            if TARGET_ppc44x || TARGET_ppc40x
-	default "2.19.1"
+	default "2.20.1"          if BINUTILS_VERSION_2_20_1
+	default "2.22"            if BINUTILS_VERSION_2_22
+	default "2.23.1"	  if BINUTILS_VERSION_2_23_1
+	default "linaro"          if BINUTILS_VERSION_LINARO
+	default "2.20.1"          if avr32
+	default "2.22"