clean up ncurses makefile based on new host build changes

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 9b4fe07..00aff71 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,23 +2,41 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_16_1
+       default BINUTILS_VERSION_2_18 if TARGET_avr32
+       default BINUTILS_VERSION_2_18 if TARGET_ppc44x || TARGET_ppc40x
+       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_17
                bool "binutils 2.17"
 

+       config BINUTILS_VERSION_2_18
+               bool "binutils 2.18"
+
+       config BINUTILS_VERSION_2_19
+               depends !TARGET_avr32
+               bool "binutils 2.19"
+
+       config BINUTILS_VERSION_2_19_1
+               depends !TARGET_avr32
+               bool "binutils 2.19.1"

 endchoice
 
 endchoice
 

+config EXTRA_BINUTILS_CONFIG_OPTIONS
+       string
+       prompt "Additional binutils options" if TOOLCHAINOPTS
+       default ""
+       help
+           Any additional binutils options you may want to include....
+

 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.17"            if BINUTILS_VERSION_2_17

-       default "2.16.1"
-
-
+       default "2.18"            if BINUTILS_VERSION_2_18
+       default "2.19"            if BINUTILS_VERSION_2_19
+       default "2.19.1"          if BINUTILS_VERSION_2_19_1
+       default "2.18"            if TARGET_avr32
+       default "2.18"            if TARGET_ppc44x || TARGET_ppc40x
+       default "2.17"