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 2c0b4f8..00aff71 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,53 +1,42 @@
 # Choose binutils version.
 
-if CONFIG_DEVEL
-       comment "Binutils Options"
-endif
-
 choice
-       prompt "Binutils Version" if CONFIG_DEVEL
-       default BR2_BINUTILS_VERSION_2_16_1
+       prompt "Binutils Version" if TOOLCHAINOPTS
+       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.
 
-       config BR2_BINUTILS_VERSION_2_15
-               bool "binutils 2.15"
-
-       config BR2_BINUTILS_VERSION_2_15_94_0_2
-               bool "binutils 2.15.94.0.2"
-
-       config BR2_BINUTILS_VERSION_2_15_94_0_2_2
-               bool "binutils 2.15.94.0.2.2"
-
-       config BR2_BINUTILS_VERSION_2_15_97
-               bool "binutils 2.15.97"
-
-       config BR2_BINUTILS_VERSION_2_16
-               bool "binutils 2.16"
-
-       config BR2_BINUTILS_VERSION_2_16_1
-               bool "binutils 2.16.1"
+       config BINUTILS_VERSION_2_17
+               bool "binutils 2.17"
 
-       config BR2_BINUTILS_VERSION_2_16_90_0_3
-               bool "binutils 2.16.90.0.3"
-
-       config BR2_BINUTILS_VERSION_2_16_91_0_1
-               bool "binutils 2.16.91.0.1"
-
-       config BR2_BINUTILS_VERSION_2_16_91_0_2
-               bool "binutils 2.16.91.0.2"
+       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
 
-config BR2_BINUTILS_VERSION
+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
-       default "2.15"            if BR2_BINUTILS_VERSION_2_15
-       default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
-       default "2.15.94.0.2.2"   if BR2_BINUTILS_VERSION_2_15_94_0_2_2
-       default "2.15.97"         if BR2_BINUTILS_VERSION_2_15_97
-       default "2.16"            if BR2_BINUTILS_VERSION_2_16
-       default "2.16.1"          if BR2_BINUTILS_VERSION_2_16_1 || !CONFIG_DEVEL
-       default "2.16.90.0.3"     if BR2_BINUTILS_VERSION_2_16_90_0_3
-       default "2.16.91.0.1"     if BR2_BINUTILS_VERSION_2_16_91_0_1
-       default "2.16.91.0.2"     if BR2_BINUTILS_VERSION_2_16_91_0_2
+       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.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"