diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-10-13 10:15:01 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-10-13 10:15:01 +0000 |
| commit | f53d9ece642824fb7a7c73c5d99e8c514bee15e6 (patch) | |
| tree | d6f78b94afed41cc36958ef4206199c62a3a04ee /toolchain | |
| parent | 8e650f6ec028b3eddd8cce67843ac1ef9a058398 (diff) | |
Update AVR32 toolchain with new binutils and uClibc, This time it works (cross-fingers)
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 7 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/uClibc/Config.in | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index fa661ed1e..1f92eafef 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -10,6 +10,7 @@ choice config BR2_BINUTILS_VERSION_2_17 depends BR2_avr32 || !BR2_nios2 && BR2_DEPRECATED + depends BR2_EXT_BINUTILS_VERSION_2_17 bool "binutils 2.17" config BR2_BINUTILS_VERSION_2_17_50_0_17 diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 9d844396c..20b8b0312 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -4,7 +4,8 @@ comment "GCC Options" choice prompt "GCC compiler Version" - default BR2_GCC_VERSION_4_2_1 + default BR2_GCC_VERSION_4_2_1 if !BR2_avr32 + default BR2_GCC_VERSION_4_1_2 if BR2_avr32 help Select the version of gcc you wish to use. @@ -19,6 +20,7 @@ choice config BR2_GCC_VERSION_4_1_2 depends !BR2_nios2 + depends BR2_EXT_GCC_VERSION_4_1_2 bool "gcc 4.1.2" config BR2_GCC_VERSION_4_2_0 @@ -27,7 +29,8 @@ choice bool "gcc 4.2.0" config BR2_GCC_VERSION_4_2_1 - depends !BR2_avr32 && !BR2_nios2 + depends !BR2_nios2 + depends BR2_EXT_GCC_VERSION_4_2_1 bool "gcc 4.2.1" # config BR2_GCC_VERSION_4_3 diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index b656cc691..211d89a82 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -62,7 +62,7 @@ choice bool "Latest Linux 2.6.21.x kernel headers" config BR2_KERNEL_HEADERS_2_6_22_1 - depends !BR2_nios2 + depends !BR2_avr32 && !BR2_nios2 bool "Linux 2.6.22.1 kernel headers" config BR2_KERNEL_HEADERS_2_6_22_10 @@ -79,6 +79,7 @@ choice config BR2_KERNEL_HEADERS_SNAP bool "Linux 2.6 snapshot" + depends !BR2_avr32 endchoice diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 386f8c9a4..b463f2bd0 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -10,11 +10,13 @@ choice Select the version of uClibc you wish to use. config BR2_UCLIBC_VERSION_0_9_28_3 - depends BR2_avr32 || BR2_DEPRECATED + depends !BR2_avr32 && BR2_DEPRECATED bool "uClibc 0.9.28.3" + depends BR2_EXT_UCLIBC_VERSION_0_9_28_3 config BR2_UCLIBC_VERSION_0_9_29 bool "uClibc 0.9.29" + depends BR2_EXT_UCLIBC_VERSION_0_9_29 config BR2_UCLIBC_VERSION_SNAPSHOT depends !BR2_avr32 |