diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-15 12:39:24 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-15 12:39:24 +0100 |
| commit | f3f1a94313361c251c4dfa164921d475835c763d (patch) | |
| tree | ebec50130a893dc257c48cbb8e57958466897641 /toolchain/uClibc/Config.in | |
| parent | 962ea5b29b0ce1966359688f2dffc173073575c8 (diff) | |
| parent | 8913798baf56e18fc8e9d07db82b2fd2421e670f (diff) | |
| download | buildroot-novena-f3f1a94313361c251c4dfa164921d475835c763d.tar.gz buildroot-novena-f3f1a94313361c251c4dfa164921d475835c763d.zip | |
Merge branch 'avr32-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'toolchain/uClibc/Config.in')
| -rw-r--r-- | toolchain/uClibc/Config.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index cc7dcd1a9..16708a6cb 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -5,8 +5,7 @@ comment "uClibc Options" choice prompt "uClibc C library Version" - default BR2_UCLIBC_VERSION_0_9_30_1 if !BR2_avr32 - default BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5 if BR2_avr32 + default BR2_UCLIBC_VERSION_0_9_30_1 help Select the version of uClibc you wish to use. @@ -21,20 +20,13 @@ choice bool "uClibc 0.9.29" config BR2_UCLIBC_VERSION_0_9_30 - depends on !BR2_avr32 depends on BR2_RECENT || BR2_DEPRECATED bool "uClibc 0.9.30" - config BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5 - depends on BR2_avr32 - bool "uClibc 0.9.30-avr32-2.1.5" - config BR2_UCLIBC_VERSION_0_9_30_1 - depends on !BR2_avr32 bool "uClibc 0.9.30.1" config BR2_UCLIBC_VERSION_SNAPSHOT - depends on !BR2_avr32 bool "daily snapshot" endchoice @@ -52,7 +44,6 @@ config BR2_UCLIBC_VERSION_STRING default 0.9.29 if BR2_UCLIBC_VERSION_0_9_29 default 0.9.30 if BR2_UCLIBC_VERSION_0_9_30 default 0.9.30.1 if BR2_UCLIBC_VERSION_0_9_30_1 - default 0.9.30-avr32-2.1.5 if BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5 default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_CONFIG @@ -61,7 +52,6 @@ config BR2_UCLIBC_CONFIG default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29 default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30 default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_1 - default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5 default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT help Some people may wish to use their own modified uClibc configuration |