[package] base-files, busybox: fix 22279, simplify code and get rid of awk

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 8fabf4c..7b5127b 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,25 +2,37 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_17
+       default BINUTILS_VERSION_2_19_1

        help
          Select the version of binutils you wish to use.
 
        help
          Select the version of binutils you wish to use.
 

-       config BINUTILS_VERSION_2_16_1
-               bool "binutils 2.16.1"
-
-       config BINUTILS_VERSION_2_17
-               bool "binutils 2.17"
-

        config BINUTILS_VERSION_2_18
        config BINUTILS_VERSION_2_18

+               depends !ubicom32

                bool "binutils 2.18"
                bool "binutils 2.18"

+
+       config BINUTILS_VERSION_2_19_1
+               bool "binutils 2.19.1"
+
+       config BINUTILS_VERSION_2_20

                depends !avr32
                depends !avr32

+               depends !ubicom32
+               bool "binutils 2.20"
+        config BINUTILS_VERSION_2_20_1
+                depends !avr32
+                depends !ubicom32
+                bool "binutils 2.20.1"
+
+       config BINUTILS_VERSION_CS
+               depends !avr32
+               depends !ubicom32
+               depends BROKEN
+               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"

 
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string
 
 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....
        default ""
        help
            Any additional binutils options you may want to include....


@@ -28,9 +40,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
        string
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
 config BINUTILS_VERSION
        string
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)

-       default "2.16.1"          if BINUTILS_VERSION_2_16_1
-       default "2.17"            if BINUTILS_VERSION_2_17

        default "2.18"            if BINUTILS_VERSION_2_18
        default "2.18"            if BINUTILS_VERSION_2_18

-       default "2.17"
-
-
+       default "2.19.1"          if BINUTILS_VERSION_2_19_1
+       default "2.20"            if BINUTILS_VERSION_2_20
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.19.1+cs"       if BINUTILS_VERSION_CS
+       default "2.19.1"