From be344f09b7fe3d87680ba599bad053f2fe84d8e1 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 10 Feb 2006 11:04:44 +0000
Subject: [PATCH] use gcc 4.0.2 and deselect ppp by default for Aruba, use gcc
 3.4.5 for the other platforms

SVN-Revision: 3210
---
 openwrt/package/ppp/Config.in   | 1 +
 openwrt/toolchain/gcc/Config.in | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openwrt/package/ppp/Config.in b/openwrt/package/ppp/Config.in
index 3ac1498024..1880200356 100644
--- a/openwrt/package/ppp/Config.in
+++ b/openwrt/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/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index bec032e299..5a6a691512 100644
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/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