2 files changed, 3 insertions, 28 deletions

diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index d35ca0430a..ad560db630 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Nokia 770 internet tablet
-#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
+#@DESCRIPTION: Machine configuration for the Compulab CM-X270
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
@@ -17,7 +17,6 @@ PREFERRED_PROVIDER_virtual/bootloader = ""
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
 
-# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
 
 #size of the root partition (yes, it is 123 MB)
@@ -28,6 +27,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-cmx270"
 
-
-include conf/machine/include/handheld-common.conf
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
 
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