diff options
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 26 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.inc | 15 |
2 files changed, 16 insertions, 25 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 1b5599b55c..d713883d71 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -2,16 +2,6 @@ # Zaurus common settings ######################## -IMAGE_FSTYPES += "jffs2 tar.gz" -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" - -EXTRA_IMAGEDEPENDS += "zaurus-installer" - - -###### -# nand -###### - ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" @@ -19,6 +9,22 @@ ERASEBLOCKSIZE_akita = "0x20000" # C3100 and C3200 have same 128MiB NAND device as akita ERASEBLOCKSIZE_spitz = "0x20000" +IMAGE_FSTYPES += "jffs2 tar.gz" + +# kernel now supports favourlzo +IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ +# && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ +# -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ +# --eraseblock=${ERASEBLOCKSIZE} -l -p; \ + cat ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ +# cat ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ +# rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" + + +EXTRA_IMAGEDEPENDS += "zaurus-installer" + ######### # xserver (FIXME: xserver-xorg is in testing on spitz) diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc deleted file mode 100644 index 4fa9f75eb3..0000000000 --- a/conf/machine/include/zaurus-clamshell.inc +++ /dev/null @@ -1,15 +0,0 @@ -include conf/machine/include/tune-xscale.inc - -EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" - -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ - && 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.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;" |