summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-10-09 14:16:19 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-10-09 14:16:19 +0000
commitdc11f7ab4057b0c334dac98773efa66e090cc6f6 (patch)
tree1bebfceb6ac3e93a09a865e62af8f7e65ed77cc4
parent7d24d4c5875d461d0c354e96e2c2933c77fae295 (diff)
parent681e51f408724d742156b3bf6e083cc30f5b9160 (diff)
merge of '0a4d4659daacb61a9f99c17aa64908c24e07b67d'
and '16ef7e010f669266539951f43abdc37a983c762a'
-rw-r--r--conf/machine/cm-x270.conf11
-rw-r--r--contrib/mtn2git/.mtn2git_empty0
2 files changed, 9 insertions, 2 deletions
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index a77a85186f..db3fb9ba51 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -17,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"
@@ -32,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 \
diff --git a/contrib/mtn2git/.mtn2git_empty b/contrib/mtn2git/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/contrib/mtn2git/.mtn2git_empty