From c8587daecba885c0ba5438aaea66281aa998ac34 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Mon, 8 Oct 2007 09:14:48 +0000
Subject: cm-x270: merge OE machine config instead of our one

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2852 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/machine/cmx270.conf | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 meta/conf/machine/cmx270.conf

(limited to 'meta/conf/machine/cmx270.conf')

diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
deleted file mode 100644
index d421de56a..000000000
--- a/meta/conf/machine/cmx270.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Machine
-#@NAME: Nokia 770 internet tablet
-#@DESCRIPTION: Machine configuration for the Compulab CM-X270
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
-
-IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
-                  mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; "
-
-IMAGE_FSTYPES ?= "jffs2 tar.bz2 ext2"
-
-IMAGE_ROOTFS_SIZE_ext2 = 120000
-
-PREFERRED_PROVIDER_virtual/bootloader = ""
-
-# 800x480 is big enough for me
-GUI_MACHINE_CLASS = "bigscreen"
-
-include conf/machine/include/tune-xscale.inc
-
-#size of the root partition (yes, it is 123 MB)
-ROOT_FLASH_SIZE = "128"
-
-# serial console port on devboard rev. B3
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-cmx270"
-
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-mbxfb"
-- 
cgit v1.2.3