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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 0ec15fd38e..9ebf52ddde 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,40 +2,27 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if ubicom32
 	default BINUTILS_VERSION_2_20_1 if avr32
-	default BINUTILS_VERSION_2_22
+	default BINUTILS_VERSION_2_22 if !avr32
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_19_1
-		depends ubicom32
-		bool "binutils 2.19.1"
-
 	config BINUTILS_VERSION_2_20_1
-		depends avr32
+		depends on avr32
 		bool "binutils 2.20.1"
 
-	config BINUTILS_VERSION_2_21
-		depends !ubicom32
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.21"
-
-	config BINUTILS_VERSION_2_21_1
-		depends !ubicom32
-		depends !avr32 || (avr32 && BROKEN)
-		bool "binutils 2.21.1"
-
 	config BINUTILS_VERSION_2_22
-		depends !ubicom32 || (ubicom32 && BROKEN)
-		depends !avr32 || (avr32 && BROKEN)
+		depends on !avr32 || (avr32 && BROKEN)
 		bool "binutils 2.22"
 
 	config BINUTILS_VERSION_2_23_1
-		depends !ubicom32 || (ubicom32 && BROKEN)
-		depends !avr32 || (avr32 && BROKEN)
+		depends on !avr32 || (avr32 && BROKEN)
 		bool "binutils 2.23.1"
 
+	config BINUTILS_VERSION_LINARO
+		depends on !avr32 || (avr32 && BROKEN)
+		bool "Linaro binutils 2.24"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -48,12 +35,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
 	string
 	prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-	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.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.19.1"          if ubicom32
+	default "linaro"          if BINUTILS_VERSION_LINARO
 	default "2.20.1"          if avr32
 	default "2.22"