use gcc 4.0.2 and deselect ppp by default for Aruba, use gcc 3.4.5 for the other...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3210 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/Config.in b/package/ppp/Config.in
index 3ac1498..1880200 100644 (file)
--- a/package/ppp/Config.in
+++ b/package/ppp/Config.in
@@ -3,6 +3,7 @@ menu "ppp............................... PPP (Point-to-Point Protocol) daemon"
 config BR2_PACKAGE_PPP
        prompt "ppp............................... PPP (Point-to-Point Protocol) daemon"
        tristate
+       default n if BR2_LINUX_2_6_ARUBA
        default y
        select BR2_PACKAGE_KMOD_PPP
 

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index bec032e..5a6a691 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -14,7 +14,8 @@ config BR2_GCC_3_4
 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL
-       default BR2_GCC_VERSION_3_4_4
+       default BR2_GCC_VERSION_4_0_2 if BR2_LINUX_2_6_ARUBA
+       default BR2_GCC_VERSION_3_4_5
        help
          Select the version of gcc you wish to use.
 
@@ -35,8 +36,8 @@ endchoice
 
 config BR2_GCC_VERSION
        string
-       default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-       default "3.4.5"     if BR2_GCC_VERSION_3_4_5
+       default "3.4.4"     if BR2_GCC_VERSION_3_4_4
+       default "3.4.5"     if BR2_GCC_VERSION_3_4_5 || !CONFIG_DEVEL
        default "4.0.2"     if BR2_GCC_VERSION_4_0_2