X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FConfig.in;h=493b6e4f5a225d966398d34fbface83a50df3a55;hp=50ee615a04a75b376d227dc693311d8743020d65;hb=HEAD;hpb=09a8334a1e36e2610a01a726fd41383d0870038a

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 50ee615a04..bf63cb969e 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,33 +2,17 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
-	default BINUTILS_VERSION_2_19_1 if ubicom32
-	default BINUTILS_VERSION_2_20_1
+	default BINUTILS_USE_VERSION_2_37
 	help
 	  Select the version of binutils you wish to use.
 
-	config BINUTILS_VERSION_2_19_1
-		bool "binutils 2.19.1"
-
-	config BINUTILS_VERSION_2_20_1
-		depends !ubicom32
-		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
-		depends !avr32
-		bool "binutils 2.22"
+	config BINUTILS_USE_VERSION_2_37
+		bool "Binutils 2.37"
+		select BINUTILS_VERSION_2_37
 
+	config BINUTILS_USE_VERSION_2_38
+		bool "Binutils 2.38"
+		select BINUTILS_VERSION_2_38
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -37,14 +21,3 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 	default ""
 	help
 	    Any additional binutils options you may want to include....
-
-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.19.1"          if ubicom32
-	default "2.20.1"