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

2 files changed, 60 insertions, 33 deletions

diff --git a/meta/conf/machine/cm-x270.conf b/meta/conf/machine/cm-x270.conf
new file mode 100644
index 0000000000..a77a85186f
--- /dev/null
+++ b/meta/conf/machine/cm-x270.conf
@@ -0,0 +1,60 @@
+#@TYPE: Machine
+#@Name: Compulab cm-x270
+#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
+#OLDEST_KERNEL = "2.6.16"
+TARGET_ARCH = "arm"
+GUI_MACHINE_CLASS ?= "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.22"
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+require conf/machine/include/tune-xscale.inc
+
+# console serial port.  If you have a L module
+# the below works.  If you have a W module, add
+# the following line to your local.conf:
+#   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
+
+# the following is for the cm-x270 L module
+CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
+
+# used by sysvinit_2 package, so rebuild this
+# package if you change the SERIAL_CONSOLE setting
+# the following is the port for the cm-x270 L module
+# I think the W module would use ttyS0, but has
+# not been tested.  This can be overwritten in 
+# local.conf
+SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE ?= "32"
+
+# for NAND flash.
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
+        sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+        -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+        -e 0x20000 -p; \
+        cd ${DEPLOY_DIR_IMAGE}; \
+        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
+        ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
+        "
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa iwmmxt"
+
+# to program the compulab NAND flash, the following scheme is suggested.  Create
+# a small rootfs that can fit in NOR flash using the following config:
+#   - Angstrom distro
+#   - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf)
+#   - angstrom-minimal-image-with-mtd-utils bitbake target
+#   - put the following in your local.conf
+#     - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
+# now, when you build the image, a cpio.gz will be generated
+# that can be used as an initramfs.  You can boot into this image and then
+# program the main rootfs jffs2 image in NAND flash using mtd-utils
+# you can select booting the initramfs, or the main nand rootfs by using
+# the "ramdisk on", or "ramdisk off" commands in the bootloader
+#
+
+
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
deleted file mode 100644
index d421de56ae..0000000000
--- 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"