From 29d39c66930d2e04f6a52b9468c236b72faee073 Mon Sep 17 00:00:00 2001 From: "g2@giantshoulder.com" Date: Wed, 23 Mar 2005 19:15:11 +0000 Subject: Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded into giantshoulder.com:/home/tom/dev/openslug/openembedded 2005/03/23 08:41:50-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 16:34:02+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/03/23 16:32:05+00:00 rpsys.net!RP openzaurus-2.6: fix typo 2005/03/23 17:31:58+01:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into marcinj.local:/home/hrw/zaurus/bb/openembedded 2005/03/23 17:31:35+01:00 local!hrw updated kdepimpi to 2.0.20 2005/03/23 07:41:31-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 16:38:17+01:00 zeckescompany.nl!alwin changed package-dep for meta-opie 2005/03/24 00:32:02+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/03/24 00:31:35+10:30 (none)!rwhitby Made Unslung *not* create ramdisk for /var and /dev when you've unslung to an external disk 2005/03/23 05:41:22-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/24 00:15:58+10:30 (none)!rwhitby Fixed the unslung patch for rc.1 2005/03/24 00:06:41+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/03/24 00:06:21+10:30 (none)!rwhitby Unslung 4.7-alpha, with support for external disks on sda1, sda2, sdb1, sdb2. 2005/03/23 14:26:04+01:00 uni-frankfurt.de!mickeyl rename wlan-ng-modules package per upstream changes 2005/03/23 14:23:31+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/03/23 14:23:20+01:00 uni-frankfurt.de!mickeyl add remind, a console PIM application. in nonworking, because it needs a gcc3.x patch 2005/03/23 04:41:30-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 13:34:56+01:00 mn-solutions.de!schurig Various twiddles for MNCI "Ramses": qmake-native: remove my weird attempt to get things right, it was very wrong :-) gdb: add REPENDS on libthread-db1 to allow debugging of threaded Qt/E 3.x apps kernel: add bluez-modules sysvinit: make startup even faster by removing access to /proc/progress 2005/03/23 03:41:24-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 22:12:18+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/03/23 22:11:52+10:30 (none)!rwhitby Added lots of modules for traffic shaping and other various things to OpenSlug kernel 2005/03/23 12:14:09+01:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/closed/build/unstable/openembedded 2005/03/23 12:13:44+01:00 (none)!br1 fixed hostapd 0.3.7 and added wpa_supplicant 0.3.8 2005/03/23 11:41:30+01:00 uni-frankfurt.de!mickeyl remove hostap-daemon from nonworking. hey folks, please look if not already there is a nonworking version before you add a new one 2005/03/23 02:41:23-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 11:38:09+01:00 uni-frankfurt.de!mickeyl opie-collections: add datebook plugins to standard opie image 2005/03/23 11:35:44+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/03/23 11:33:22+01:00 uni-frankfurt.de!mickeyl add newer gpsd versions and a fixed start/stop script 2005/03/23 11:31:34+01:00 uni-frankfurt.de!mickeyl opie packaging changes in meta-opie and opie-login 2005/03/23 11:06:47+01:00 (none)!br1 added packages "ser" and "mystun" contributed by Sven-Ola Tuecke 2005/03/23 11:02:05+01:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/closed/build/unstable/openembedded 2005/03/22 17:41:23-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 01:26:50+00:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/03/23 01:26:05+00:00 (none)!cwiiis Use the sourceforge source for freetype, as it seems to be the primary download location now. 2005/03/23 01:24:53+00:00 (none)!cwiiis Small gpe-related updates to openzaurus-3.5.3.conf. 2005/03/23 01:23:49+00:00 (none)!cwiiis Correct XLIBS_MIRROR 2005/03/22 07:41:25-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/22 16:31:48+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/03/22 16:31:38+01:00 uni-frankfurt.de!mickeyl libqte2: set package arch to machine arch since we supply machine specific patches and flags 2005/03/22 15:11:11+00:00 (none)!cwiiis Use ?= instead of = in conf/distro/preferred-gpe-versions.inc, so as not to override user-specified settings 2005/03/22 22:57:38+10:30 (none)!rwhitby Bumped the Openslug kernel PR 2005/03/22 22:53:49+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/03/22 22:53:07+10:30 (none)!rwhitby Changed CONFIG_ATALK from =y to =m in Unslung kernel 2005/03/22 03:41:21-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/22 12:30:28+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/03/22 12:30:12+01:00 uni-frankfurt.de!mickeyl include tune-xscale in the pxa machines. root file systems can be built with all optimizations since they are machine specific anyway. the unified feed though needs to be built using a tune-strongarm based machine configuration 2005/03/22 12:28:44+01:00 local!hrw added qpf-gentium font to meta-opie 2005/03/22 12:27:20+01:00 local!hrw updated qpf-dejavufonts to 1.8 added all rotations 2005/03/22 12:26:15+01:00 local!hrw added all rotations to qpf-hunkyfonts 2005/03/22 12:09:08+01:00 uni-frankfurt.de!mickeyl add qpf-gentium, a free font with lots of characters. thanks hrw for converting. 2005/03/22 10:39:58+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/03/22 00:41:26-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/22 07:43:44+00:00 reciva.com!pb change "h2200_linear" to "linear_h2200". Reported by Matt Reimer. 2005/03/21 17:41:26-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/22 01:56:50+01:00 dyndns.org!reenoo libglade: update to 2.4.2 which fixes improper use of the toolbar API. make no-xml2.patch apply against 2.4.2. 2005/03/22 00:59:21+01:00 uni-frankfurt.de!mickeyl split tosa machine configuration into generic, 2.4, 2.6 parts 2005/03/22 00:54:55+01:00 uni-frankfurt.de!mickeyl add a version of orinoco-0.13e that compiles against kernel 2.6 and choose that version for the clamshells and the poodle 2005/03/18 16:13:17+01:00 (none)!br1 added madwifi BSD branch build 2005/03/18 16:12:01+01:00 (none)!br1 added hostap-daemon 0.3.7 BKrev: 4241c03fA7V8WMbGM7hnEqx17eXRkw --- conf/machine/tosa.conf | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'conf/machine/tosa.conf') diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index be495925c1..f742bed742 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -4,24 +4,9 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \ - orinoco-modules sharp-sdmmc-support usbutils" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \ - kernel-module-evdev kernel-module-net-fd \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel-module-usb-storage \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre \ - kernel-module-irnet kernel-module-ipip kernel-module-usbcore \ - kernel-module-usbdcore kernel-module-usbdmonitor" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" + +KERNEL_VERSION ?= "2.4" +include conf/machine/tosa-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" @@ -31,7 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" -- cgit 1.2.3-korg