diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2013-10-15 00:05:26 +0200 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-10-15 23:47:35 +0100 |
| commit | 4e66e13e776ad0a36eb780a8ac7998dab682b585 (patch) | |
| tree | ab5405e9314cc0060d9fb7720d12ecf3c1cccaa2 | |
| parent | 40c9882923f2a5f056a4d56acd9261cae9e8af96 (diff) | |
| download | meta-handheld-4e66e13e776ad0a36eb780a8ac7998dab682b585.tar.gz | |
zaurus: simplify JFFS2 creation using code in image_fstype.bbclass
fix ${ERASEBLOCKSIZE} remnant for collie
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
| -rw-r--r-- | conf/machine/akita.conf | 3 | ||||
| -rw-r--r-- | conf/machine/c7x0.conf | 3 | ||||
| -rw-r--r-- | conf/machine/collie.conf | 8 | ||||
| -rw-r--r-- | conf/machine/poodle.conf | 3 | ||||
| -rw-r--r-- | conf/machine/spitz.conf | 5 | ||||
| -rw-r--r-- | conf/machine/tosa.conf | 3 |
6 files changed, 11 insertions, 14 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 12a2fe9..a6f6f14 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -11,8 +11,7 @@ require conf/machine/include/tune-xscale.inc PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt" MACHINE_FEATURES += "iwmmxt" -EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x20000" -EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" +JFFS2_ERASEBLOCK = "0x20000" # UBI: max akita (128-7 MiB = 968 PEBs) # 121 x 1024 : 128 = 968 PEBs diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index ffa998d..4254258 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -11,8 +11,7 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc -EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" -EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" +JFFS2_ERASEBLOCK = "0x4000" # UBI: max c7x0 (128-7 MiB = 7744 PEBs) # 121 x 1024 : 16 = 7744 PEBs diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 26bc257..baa2c0f 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,10 +5,12 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-strongarm1100.inc -EXTRA_IMAGECMD_jffs2 = "-p 14680064 -l -e 0x20000 -n" -EXTRA_IMAGECMD_sum.jffs2 = "-p -l -e 0x20000 -n" +JFFS2_ERASEBLOCK = "0x20000" + +EXTRA_IMAGECMD_jffs2 = "-p 14680064 -l -e ${JFFS2_ERASEBLOCK}" +EXTRA_IMAGECMD_sum.jffs2 = "-p -l -e ${JFFS2_ERASEBLOCK}" # UBI: max collie (14.125 = 113 PEBs) # 14.125 x 1024 : 128 = 113 PEBs MKUBIFS_ARGS = "-m 2048 -e 129024 -c 113 -x zlib" -UBINIZE_ARGS = "-m 2048 -p ${ERASEBLOCKSIZE} -s 512" +UBINIZE_ARGS = "-m 2048 -p 131072 -s 512" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 53dbc4a..9d11893 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -8,8 +8,7 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc -EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" -EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" +JFFS2_ERASEBLOCK = "0x4000" # UBI: max poodle (64-7 MiB = 3648 PEBs) # 57 x 1024 : 16 = 3648 PEBs diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 6a74165..9d41637 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -12,7 +12,7 @@ # # SL-C3000 (16-7 MiB = 576 PEBs) # 9 x 1024 : 16 = 576 PEBs -# EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" +# JFFS2_ERASEBLOCK = "0x4000" # MKUBIFS_ARGS = "-m 512 -e 15872 -c 576 -x zlib" # UBINIZE_ARGS = "-m 512 -p 16384 -s 256" @@ -22,8 +22,7 @@ require conf/machine/include/tune-xscale.inc MACHINE_FEATURES += "iwmmxt" PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt" -EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x20000" -EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" +JFFS2_ERASEBLOCK = "0x20000" # UBI: max spitz (128-7 MiB = 968 PEBs) # 121 x 1024 : 128 = 968 PEBs diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 0ec93c7..7e8c0da 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -8,8 +8,7 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc -EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" -EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" +JFFS2_ERASEBLOCK = "0x4000" # UBI: max tosa (128-7 MiB = 7744 PEBs) # 121 x 1024 : 16 = 7744 PEBs |