[generic] fix layer7 patches for Kernels >= 2.6.35, thanks Daniel Gimpelevich

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index ea84619..27a583d 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,30 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       default BINUTILS_VERSION_2_18 if TARGET_ppc44x
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_19_1 if (avr32 || ubicom32)
+       default BINUTILS_VERSION_2_20_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_18
-               bool "binutils 2.18"
-

        config BINUTILS_VERSION_2_19_1
        config BINUTILS_VERSION_2_19_1

-               depends !TARGET_avr32

                bool "binutils 2.19.1"
                bool "binutils 2.19.1"

+
+        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....


@@ -26,8 +33,8 @@ 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.18"            if BINUTILS_VERSION_2_18

        default "2.19.1"          if BINUTILS_VERSION_2_19_1
        default "2.19.1"          if BINUTILS_VERSION_2_19_1

-       default "2.18"            if TARGET_avr32
-       default "2.18"            if TARGET_ppc44x
-       default "2.19.1"
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.19.1+cs"       if BINUTILS_VERSION_CS
+       default "2.19.1"          if (avr32 || ubicom32)
+       default "2.20.1"