mpc85xx: fix address config for ws-ap3825i

[openwrt/openwrt.git] / toolchain / binutils / Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 9ebf52ddde5d25373f9d05a113f7a402aba43a1a..6ba3c5248723bda434d85fa0839bb46c9ce9e0a5 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,27 +2,33 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_20_1 if avr32
-       default BINUTILS_VERSION_2_22 if !avr32
+       default BINUTILS_USE_VERSION_2_40
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_20_1
-               depends on avr32
-               bool "binutils 2.20.1"
+       config BINUTILS_USE_VERSION_2_37
+               bool "Binutils 2.37"
+               select BINUTILS_VERSION_2_37
 
-       config BINUTILS_VERSION_2_22
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.22"
+       config BINUTILS_USE_VERSION_2_38
+               bool "Binutils 2.38"
+               select BINUTILS_VERSION_2_38
 
-       config BINUTILS_VERSION_2_23_1
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.23.1"
+       config BINUTILS_USE_VERSION_2_39
+               bool "Binutils 2.39"
+               select BINUTILS_VERSION_2_39
 
-       config BINUTILS_VERSION_LINARO
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "Linaro binutils 2.24"
+       config BINUTILS_USE_VERSION_2_40
+               bool "Binutils 2.40"
+               select BINUTILS_VERSION_2_40
 
+       config BINUTILS_USE_VERSION_2_41
+               bool "Binutils 2.41"
+               select BINUTILS_VERSION_2_41
+
+       config BINUTILS_USE_VERSION_2_42
+               bool "Binutils 2.42"
+               select BINUTILS_VERSION_2_42
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -31,13 +37,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.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"