summaryrefslogtreecommitdiff
path: root/meta/conf/machine/c7x0.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-02 17:00:54 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-02 17:00:54 +0000
commit65f6428521a6721b94a9c3f90a229ef06179ab51 (patch)
treedf9dcda77e0bacb2f7d496e272ea13df649a83dd /meta/conf/machine/c7x0.conf
parentd20e041f2f9c27bd3fc8f0f266c1e6a1f286eb3f (diff)
downloadopenembedded-core-65f6428521a6721b94a9c3f90a229ef06179ab51.tar.gz
openembedded-core-65f6428521a6721b94a9c3f90a229ef06179ab51.tar.bz2
openembedded-core-65f6428521a6721b94a9c3f90a229ef06179ab51.zip
conf/machine: Sync various changes with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2656 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/machine/c7x0.conf')
-rw-r--r--meta/conf/machine/c7x0.conf7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
index 7f17d28510..2b2f1a4355 100644
--- a/meta/conf/machine/c7x0.conf
+++ b/meta/conf/machine/c7x0.conf
@@ -2,10 +2,13 @@
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-include conf/machine/include/zaurus-clamshell.inc
-include conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
IMAGE_FSTYPES ?= "jffs2"
ROOT_FLASH_SIZE = "25"
# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
+
+#XSERVER = "xserver-kdrive-imageon"
+