summaryrefslogtreecommitdiff
path: root/meta/conf/machine/cmx270.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/cmx270.conf
parent6903177952ab2aa9ce911bdc3dd21c3ea519206b (diff)
downloadopenembedded-core-8ea8ee86875b5c0bee1c84c6b100b3959070e495.tar.gz
openembedded-core-8ea8ee86875b5c0bee1c84c6b100b3959070e495.tar.bz2
openembedded-core-8ea8ee86875b5c0bee1c84c6b100b3959070e495.tar.xz
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/cmx270.conf')
-rw-r--r--meta/conf/machine/cmx270.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index d35ca0430..ad560db63 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"