octeon: select gcc 4.6 by default

[openwrt/openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index defb1b1b0e0bf5b3e68b2eb0d5be06bb5b505ec8..1ec6503097c2ce1238d6bc6c3c1097a42ce8694b 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,9 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-       default GCC_USE_VERSION_4_6_LINARO
+       default GCC_USE_VERSION_4_4_7 if avr32
+       default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
+       default GCC_USE_VERSION_4_8_LINARO
        help
          Select the version of gcc you wish to use.
 
@@ -12,14 +13,6 @@ choice
                bool "gcc 4.4.7"
                depends on avr32
 
-       config GCC_USE_VERSION_4_6_3
-               select GCC_VERSION_4_6_3
-               bool "gcc 4.6.3"
-
-       config GCC_USE_VERSION_4_7_2
-               select GCC_VERSION_4_7_2
-               bool "gcc 4.7.2"
-
        config GCC_USE_VERSION_4_8_0
                select GCC_VERSION_4_8_0
                bool "gcc 4.8.0"
@@ -28,10 +21,6 @@ choice
                select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
 
-       config GCC_USE_VERSION_4_7_LINARO
-               select GCC_VERSION_4_7_LINARO
-               bool "gcc 4.7.x with Linaro enhancements"
-
        config GCC_USE_VERSION_4_8_LINARO
                select GCC_VERSION_4_8_LINARO
                bool "gcc 4.8.x with Linaro enhancements"