cm-x270: merged support for misc NAND chips (from OE)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3526 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 10 insertions, 2 deletions

diff --git a/meta/conf/machine/cm-x270.conf b/meta/conf/machine/cm-x270.conf
index 69a9964755..1b6188753e 100644
--- a/meta/conf/machine/cm-x270.conf
+++ b/meta/conf/machine/cm-x270.conf
@@ -6,6 +6,7 @@ TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux ?= "2.6.23"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
@@ -16,6 +17,13 @@ require conf/machine/include/tune-xscale.inc
 # the following line to your local.conf:
 #   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
 
+# NAND flash eraseblock size
+# most of the older cm-x270 modules are populated with NAND flash
+# that have 128KiB eraseblocks.  Recently, a user encounted
+# a device that has 16KiB eraseblocks.  The following define
+# can be overridden in local.conf if you have one of these devices.
+CMX270_NAND_ERASEBLOCK_SIZE ?= "0x20000"
+
 # the following is for the cm-x270 L module
 CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
@@ -31,10 +39,10 @@ SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
 ROOT_FLASH_SIZE ?= "32"
 
 # for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${CMX270_NAND_ERASEBLOCK_SIZE} --pad --no-cleanmarkers;\
         sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
         -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-        -e 0x20000 -p; \
+        -e ${CMX270_NAND_ERASEBLOCK_SIZE} -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 \