From 595eb8e3314384cf60e343d54c6046860a62327c Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 14 Oct 2013 22:34:10 +0200 Subject: meta-handheld: use explicit ERASEBLOCKSIZE and remove the variable Signed-off-by: Andrea Adami --- conf/machine/akita.conf | 6 ++---- conf/machine/c7x0.conf | 6 ++---- conf/machine/collie.conf | 6 ++---- conf/machine/h3600.conf | 3 +-- conf/machine/poodle.conf | 6 ++---- conf/machine/spitz.conf | 6 ++---- conf/machine/tosa.conf | 6 ++---- 7 files changed, 13 insertions(+), 26 deletions(-) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index b7b1ed7..12a2fe9 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -11,12 +11,10 @@ require conf/machine/include/tune-xscale.inc PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt" MACHINE_FEATURES += "iwmmxt" -ERASEBLOCKSIZE = "0x20000" - -EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" +EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x20000" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" # UBI: max akita (128-7 MiB = 968 PEBs) # 121 x 1024 : 128 = 968 PEBs MKUBIFS_ARGS = "-m 2048 -e 129024 -c 968 -x zlib" -UBINIZE_ARGS = "-m 2048 -p ${ERASEBLOCKSIZE} -s 512" +UBINIZE_ARGS = "-m 2048 -p 131072 -s 512" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 3c8e69a..ffa998d 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -11,12 +11,10 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc -ERASEBLOCKSIZE = "0x4000" - -EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" +EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" # UBI: max c7x0 (128-7 MiB = 7744 PEBs) # 121 x 1024 : 16 = 7744 PEBs MKUBIFS_ARGS = "-m 512 -e 15872 -c 7744 -x zlib" -UBINIZE_ARGS = "-m 512 -p ${ERASEBLOCKSIZE} -s 256" +UBINIZE_ARGS = "-m 512 -p 16384 -s 256" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 00a25bf..26bc257 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,10 +5,8 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-strongarm1100.inc -ERASEBLOCKSIZE = "0x20000" - -EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=${ERASEBLOCKSIZE} -n" -EXTRA_IMAGECMD_sum.jffs2 = "--pad -l --eraseblock=0x20000 -n" +EXTRA_IMAGECMD_jffs2 = "-p 14680064 -l -e 0x20000 -n" +EXTRA_IMAGECMD_sum.jffs2 = "-p -l -e 0x20000 -n" # UBI: max collie (14.125 = 113 PEBs) # 14.125 x 1024 : 128 = 113 PEBs diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index adb354d..78e11be 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -27,8 +27,7 @@ MACHINE_EXTRA_RDEPENDS = "mtd-utils mtd-utils-jffs2" MACHINE_EXTRA_RRECOMMENDS = "" -ERASEBLOCKSIZE = "0x40000" -EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" +EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x40000" # # Modules autoload and other boot properties diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index b3a34f8..53dbc4a 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -8,12 +8,10 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc -ERASEBLOCKSIZE = "0x4000" - -EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" +EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" # UBI: max poodle (64-7 MiB = 3648 PEBs) # 57 x 1024 : 16 = 3648 PEBs MKUBIFS_ARGS = "-m 512 -e 15872 -c 3648 -x zlib" -UBINIZE_ARGS = "-m 512 -p ${ERASEBLOCKSIZE} -s 256" +UBINIZE_ARGS = "-m 512 -p 16384 -s 256" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index e88462e..d4243fa 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -22,12 +22,10 @@ PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt" # MKUBIFS_ARGS = "-m 512 -e 15872 -c 576 -x zlib" # UBINIZE_ARGS = "-m 512 -p 16384 -s 256" -ERASEBLOCKSIZE = "0x20000" - -EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" +EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x20000" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" # UBI: max spitz (128-7 MiB = 968 PEBs) # 121 x 1024 : 128 = 968 PEBs MKUBIFS_ARGS = "-m 2048 -e 129024 -c 968 -x zlib" -UBINIZE_ARGS = "-m 2048 -p ${ERASEBLOCKSIZE} -s 512" +UBINIZE_ARGS = "-m 2048 -p 131072 -s 512" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index dcfad04..0ec93c7 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -8,12 +8,10 @@ require conf/machine/include/zaurus.inc require conf/machine/include/tune-xscale.inc -ERASEBLOCKSIZE = "0x4000" - -EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" +EXTRA_IMAGECMD_jffs2 = "-p -l -e 0x4000" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" # UBI: max tosa (128-7 MiB = 7744 PEBs) # 121 x 1024 : 16 = 7744 PEBs MKUBIFS_ARGS = "-m 512 -e 15872 -c 7744 -x zlib" -UBINIZE_ARGS = "-m 512 -p ${ERASEBLOCKSIZE} -s 256" +UBINIZE_ARGS = "-m 512 -p 16384 -s 256" -- cgit 1.2.3-korg