toolchain: get rid of uclibc version kconfig symbol overloading

SVN-Revision: 36356

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 74d15ae33d39d2f357a8b7c9b3d32144f391d7d9..08ea00a3132e7cfa9bec7b83febed5b1499b609b 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,16 +3,16 @@
 choice
        prompt "uClibc Version"
        depends on TOOLCHAINOPTS && USE_UCLIBC
 choice
        prompt "uClibc Version"
        depends on TOOLCHAINOPTS && USE_UCLIBC

-       default UCLIBC_VERSION_0_9_33
+       default UCLIBC_USE_VERSION_0_9_33

        help
          Select the version of uClibc you wish to use.
 
        help
          Select the version of uClibc you wish to use.
 

-       config UCLIBC_VERSION_0_9_33
+       config UCLIBC_USE_VERSION_0_9_33
+               select UCLIBC_VERSION_0_9_33

                bool "uClibc 0.9.33.2"
 
 endchoice
 
                bool "uClibc 0.9.33.2"
 
 endchoice
 

-

 # Debug version.
 
 config UCLIBC_ENABLE_DEBUG
 # Debug version.
 
 config UCLIBC_ENABLE_DEBUG

diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index 0d0b4a76a388ed8c4bcc59e598538ec0065ca4d5..dd302f256b442d17cdbb997f985282b52644a342 100644 (file)
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -4,10 +4,6 @@ config UCLIBC_VERSION
        default "0.9.33.2"       if UCLIBC_VERSION_0_9_33
        default "0.9.33.2"
 
        default "0.9.33.2"       if UCLIBC_VERSION_0_9_33
        default "0.9.33.2"
 

-if !TOOLCHAINOPTS
-
-       config UCLIBC_VERSION_0_9_33
-               default y if USE_UCLIBC
-               bool
-
-endif
+config UCLIBC_VERSION_0_9_33
+       default y if !TOOLCHAINOPTS && USE_UCLIBC
+       bool