浏览代码

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>
Thomas Petazzoni 15 年之前
父节点
当前提交
5c6ccd9f20
共有 1 个文件被更改,包括 6 次插入9 次删除
  1. 6 9
      toolchain/gcc/Config.in

+ 6 - 9
toolchain/gcc/Config.in

@@ -10,20 +10,18 @@ choice
 	  Select the version of gcc you wish to use.
 	  Select the version of gcc you wish to use.
 
 
 	config BR2_GCC_VERSION_4_1_2
 	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
 		depends on BR2_DEPRECATED
 		bool "gcc 4.1.2"
 		bool "gcc 4.1.2"
 
 
 	config BR2_GCC_VERSION_4_2_1
 	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
 		depends on BR2_DEPRECATED
 		bool "gcc 4.2.1"
 		bool "gcc 4.2.1"
 
 
 	config BR2_GCC_VERSION_4_2_2
 	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"
 		bool "gcc 4.2.2"
 
 
 	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	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"
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 
 	config BR2_GCC_VERSION_4_2_3
 	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"
 		bool "gcc 4.2.3"
 
 
 	config BR2_GCC_VERSION_4_2_4
 	config BR2_GCC_VERSION_4_2_4