summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-12-14 11:57:14 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2009-12-14 23:54:43 +0100
commit5c6ccd9f20a9aec2d26bcbb32f17a027b333ace3 (patch)
treeec072d555d4b915eb2961ed084136f8ae3a51064
parent3a24927a0e6f041a018085b5a7fc50312001fddc (diff)
gcc: on avr32, only allow avr32 gcc versions
Remove references to BR2_EXT_GCC_VERSION_* configuration options, and only allows special avr32 gcc versions on the AVR32 architecture. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--toolchain/gcc/Config.in15
1 files changed, 6 insertions, 9 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 3d3da46ec..07e42a6da 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -10,20 +10,18 @@ choice
Select the version of gcc you wish to use.
config BR2_GCC_VERSION_4_1_2
- depends on !BR2_nios2
- depends on BR2_EXT_GCC_VERSION_4_1_2
+ depends on !BR2_nios2 && !BR2_avr32
depends on BR2_DEPRECATED
bool "gcc 4.1.2"
config BR2_GCC_VERSION_4_2_1
- depends on !BR2_nios2
- depends on BR2_EXT_GCC_VERSION_4_2_1
+ depends on !BR2_nios2 && !BR2_avr32
depends on BR2_DEPRECATED
bool "gcc 4.2.1"
config BR2_GCC_VERSION_4_2_2
- depends on BR2_EXT_GCC_VERSION_4_2_2
- depends on BR2_DEPRECATED || BR2_avr32
+ depends on !BR2_avr32
+ depends on BR2_DEPRECATED
bool "gcc 4.2.2"
config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
@@ -31,9 +29,8 @@ choice
bool "gcc 4.2.2-avr32-2.1.5"
config BR2_GCC_VERSION_4_2_3
- depends on !BR2_nios2
- depends on BR2_EXT_GCC_VERSION_4_2_3
- depends on BR2_DEPRECATED || BR2_avr32
+ depends on !BR2_nios2 && !BR2_avr32
+ depends on BR2_DEPRECATED
bool "gcc 4.2.3"
config BR2_GCC_VERSION_4_2_4