summaryrefslogtreecommitdiff
path: root/conf/machine/collie.conf
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-01-18 14:21:33 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-01-18 14:21:33 +0000
commit936f218c36509a98d9d587a7918f2a33d1441d91 (patch)
tree9734ba29bc35b88181316a4535197c3121364d99 /conf/machine/collie.conf
parent408fb34b733a87d181f2b2ef148b8fe61c8434a8 (diff)
parent7569440e6587054a298f1417447750a3aff0afd9 (diff)
merge of 'a0f0a04325ed193844895cf9b74e8b1b48deac4e'
and 'e55bf39595a78df12d17e4b80e9ed474ad5a467d'
Diffstat (limited to 'conf/machine/collie.conf')
-rw-r--r--conf/machine/collie.conf7
1 files changed, 1 insertions, 6 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b9e6f6e6aa..04e0e83051 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -6,18 +6,13 @@ TARGET_ARCH = "arm"
TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-# This is needed for the ramdisk script to work
-MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
IMAGE_LINGUAS = ""
IMAGE_FSTYPES ?= "jffs2 tar.gz"
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
-
-GUI_MACHINE_CLASS_poodle = "smallscreen"