fix BR2_ and CONFIG_ issues

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 8563080617c9b68c5237b646e9fac4960f159a3f..56b29c3ec11445b1a9cf00e006630c2fdd35ab18 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,66 +1,40 @@
 # Choose binutils version.
 
-comment "Binutils Options"
-
 choice
-       prompt "Binutils Version"
-       default BR2_BINUTILS_VERSION_2_14_90_0_8
+       prompt "Binutils Version" if TOOLCHAINOPTS
+       default BINUTILS_VERSION_2_16_1
        help
          Select the version of binutils you wish to use.
 
-       config BR2_BINUTILS_VERSION_2_14_90_0_6
-               bool "binutils 2.14.90.0.6"
-
-       config BR2_BINUTILS_VERSION_2_14_90_0_7
-               bool "binutils 2.14.90.0.7"
-
-       config BR2_BINUTILS_VERSION_2_14_90_0_8
-               bool "binutils 2.14.90.0.8"
-
-       config BR2_BINUTILS_VERSION_2_15
-               bool "binutils 2.15"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_1
-               bool "binutils 2.15.90.0.1"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_1_1
-               bool "binutils 2.15.90.0.1.1"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_2
-               bool "binutils 2.15.90.0.2"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_3
-               bool "binutils 2.15.90.0.3"
+       config BINUTILS_VERSION_2_15_94_0_2
+               bool "binutils 2.15.94.0.2"
 
-       config BR2_BINUTILS_VERSION_2_15_91_0_1
-               bool "binutils 2.15.91.0.1"
+       config BINUTILS_VERSION_2_16_1
+               bool "binutils 2.16.1"
 
-       config BR2_BINUTILS_VERSION_2_15_91_0_2
-               bool "binutils 2.15.91.0.2"
+       config BINUTILS_VERSION_2_16_90_0_3
+               bool "binutils 2.16.90.0.3"
 
-       config BR2_BINUTILS_VERSION_2_15_92_0_2
-               bool "binutils 2.15.92.0.2"
+       config BINUTILS_VERSION_2_16_91_0_1
+               bool "binutils 2.16.91.0.1"
 
-       config BR2_BINUTILS_VERSION_2_15_94_0_1
-               bool "binutils 2.15.94.0.1"
+       config BINUTILS_VERSION_2_16_91_0_2
+               bool "binutils 2.16.91.0.2"
 
-       config BR2_BINUTILS_VERSION_2_15_94_0_2
-               bool "binutils 2.15.94.0.2"
+       config BINUTILS_VERSION_2_16_91_0_6
+               bool "binutils 2.16.91.0.6"
 
 endchoice
 
-config BR2_BINUTILS_VERSION
+config BINUTILS_VERSION
        string
-       default "2.14.90.0.6"     if BR2_BINUTILS_VERSION_2_14_90_0_6
-       default "2.14.90.0.7"     if BR2_BINUTILS_VERSION_2_14_90_0_7
-       default "2.14.90.0.8"     if BR2_BINUTILS_VERSION_2_14_90_0_8
-       default "2.15"            if BR2_BINUTILS_VERSION_2_15
-       default "2.15.90.0.1"     if BR2_BINUTILS_VERSION_2_15_90_0_1
-       default "2.15.90.0.0.1.1" if BR2_BINUTILS_VERSION_2_15_90_0_1_1
-       default "2.15.90.0.2"     if BR2_BINUTILS_VERSION_2_15_90_0_2
-       default "2.15.90.0.3"     if BR2_BINUTILS_VERSION_2_15_90_0_3
-       default "2.15.91.0.1"     if BR2_BINUTILS_VERSION_2_15_91_0_1
-       default "2.15.91.0.2"     if BR2_BINUTILS_VERSION_2_15_91_0_2
-       default "2.15.92.0.2"     if BR2_BINUTILS_VERSION_2_15_92_0_2
-       default "2.15.94.0.1"     if BR2_BINUTILS_VERSION_2_15_94_0_1
-       default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
+       prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
+       default "2.15.94.0.2"     if BINUTILS_VERSION_2_15_94_0_2
+       default "2.16.1"          if BINUTILS_VERSION_2_16_1
+       default "2.16.90.0.3"     if BINUTILS_VERSION_2_16_90_0_3
+       default "2.16.91.0.1"     if BINUTILS_VERSION_2_16_91_0_1
+       default "2.16.91.0.2"     if BINUTILS_VERSION_2_16_91_0_2
+       default "2.16.91.0.6"     if BINUTILS_VERSION_2_16_91_0_6
+       default "2.16.1"
+
+