summaryrefslogtreecommitdiff
path: root/meta/conf/machine/qemuarm.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-28 08:21:36 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-28 08:21:36 +0000
commit8ea8ee86875b5c0bee1c84c6b100b3959070e495 (patch)
tree422f56efe09f6955df100df13465c3594a228d52 /meta/conf/machine/qemuarm.conf
parent6903177952ab2aa9ce911bdc3dd21c3ea519206b (diff)
downloadopenembedded-core-8ea8ee86875b5c0bee1c84c6b100b3959070e495.tar.gz
openembedded-core-8ea8ee86875b5c0bee1c84c6b100b3959070e495.tar.bz2
openembedded-core-8ea8ee86875b5c0bee1c84c6b100b3959070e495.zip
cmx270.conf, qemuarm.conf: Update after task-machine changes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@569 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/machine/qemuarm.conf')
-rw-r--r--meta/conf/machine/qemuarm.conf25
1 files changed, 1 insertions, 24 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 40de141fd5..cc4daa491f 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -10,37 +10,14 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed"
-include conf/machine/include/handheld-common.conf
include conf/machine/include/tune-arm926ejs.conf
SERIAL_CONSOLE = "115200 ttyAMA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
-
-# Ethernet modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-# kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \
-# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
IMAGE_FSTYPES ?= "tar.bz2"
ROOT_FLASH_SIZE = "100"
-# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
-# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte