summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/zaurus-2.6.conf5
-rw-r--r--conf/machine/include/zaurus-clamshell.conf19
2 files changed, 13 insertions, 11 deletions
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf
index 45d8891b44..4e9e6a2ad9 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.conf
@@ -6,7 +6,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
MACHINE_KERNEL_VERSION = "2.6"
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
+ERASEBLOCKSIZE = "0x4000"
+ERASEBLOCKSIZE_akita = "0x20000"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 83d17aeb78..5e51566484 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -1,14 +1,13 @@
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
- --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
+ --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \
+ sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+ -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+ --eraseblock=${ERASEBLOCKSIZE} -l -p; \
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
- ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
-
-# add a summary to the jffs2 file to make it mount a lot faster
-EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
- -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
- --eraseblock=0x4000 -l -p"
-
-IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
- ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
+ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+ rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+ ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \
+ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"