diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2006-02-10 11:04:44 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2006-02-10 11:04:44 +0000 |
| commit | 8bb7668b1914bd32dc87968326d04ed14af4091d (patch) | |
| tree | 671fafc2b8209c125320d6bcb580314c74db99d8 | |
| parent | 2aac345f2ba25855134b527d40671a28722202e4 (diff) | |
| download | master-187ad058-8bb7668b1914bd32dc87968326d04ed14af4091d.tar.gz master-187ad058-8bb7668b1914bd32dc87968326d04ed14af4091d.tar.bz2 master-187ad058-8bb7668b1914bd32dc87968326d04ed14af4091d.zip | |
use gcc 4.0.2 and deselect ppp by default for Aruba, use gcc 3.4.5 for the other platforms
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3210 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/ppp/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/package/ppp/Config.in b/package/ppp/Config.in index 3ac1498024..1880200356 100644 --- 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 bec032e299..5a6a691512 100644 --- 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 |