mac80211: merge setup script fix from r29606

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 3cb4a827f579341b967181de76760f90f2800427..6bd78ad643e309069458d3c52870042bb0ea3469 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,26 +2,27 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       default BINUTILS_VERSION_2_17
+       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"
+           Select the version of binutils you wish to use.
 
        config BINUTILS_VERSION_2_18
+               depends !ubicom32
                bool "binutils 2.18"
 
-       config BINUTILS_VERSION_2_19
-               depends !TARGET_avr32
-               bool "binutils 2.19"
+       config BINUTILS_VERSION_2_19_1
+               bool "binutils 2.19.1"
+
+       config BINUTILS_VERSION_2_20_1
+               depends !avr32
+               depends !ubicom32
+               bool "binutils 2.20.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....
@@ -29,8 +30,7 @@ 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.17"
+       default "2.19.1"          if BINUTILS_VERSION_2_19_1
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.19.1"