Convert shat to new packaging style

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

diff --git a/openwrt/toolchain/binutils/Config.in b/openwrt/toolchain/binutils/Config.in
index d1d6295..8849ef5 100644 (file)
--- a/openwrt/toolchain/binutils/Config.in
+++ b/openwrt/toolchain/binutils/Config.in
@@ -1,19 +1,15 @@
 # Choose binutils version.
 
 # Choose binutils version.
 

-comment "Binutils Options"
+if CONFIG_DEVEL
+       comment "Binutils Options"
+endif

 
 choice
 
 choice

-       prompt "Binutils Version"
-       default BR2_BINUTILS_VERSION_2_15_91_0_2
+       prompt "Binutils Version" if CONFIG_DEVEL
+       default BR2_BINUTILS_VERSION_2_15_94_0_2

        help
          Select the version of binutils you wish to use.
 
        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_14_90_0_8
                bool "binutils 2.14.90.0.8"
 


@@ -47,12 +43,17 @@ choice
        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
                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_16_90_0_1
+               bool "binutils 2.16.90.0.1"
+
+

 endchoice
 
 config BR2_BINUTILS_VERSION
        string
 endchoice
 
 config BR2_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.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


@@ -63,4 +64,5 @@ config BR2_BINUTILS_VERSION
        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.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
+       default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2 || !CONFIG_DEVEL
+       default "2.16.90.0.1"     if BR2_BINUTILS_VERSION_2_16_90_0_1