zaurus.inc: add framework for ubifs image types
PATCH 1/2 zaurus.inc: add framework for ubifs image types
* In preparation for the next kexecboot release.
* tested on poodle, c7x0 and spitz 3200
* (the different partitioning btw spitz models will be
* detected by kexecbot)
--- conf/machine/include/zaurus.inc | 47 ++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 6 deletions(-)
conf/machine/include/zaurus.inc +41 -6
@@ -2,22 +2,57 @@ # Zaurus common settings ######################## +IMAGE_FSTYPES ?= "tar.gz jffs2 sum.jffs2 ubifs" +INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma" +IMAGE_DEVICE_TABLES = "" + ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" +ERASEBLOCKSIZE_spitz = "0x20000" # Warning! SL-C3000 has "0x4000" (16MiB NAND) # C3100 and C3200 have same 128MiB NAND device as akita -ERASEBLOCKSIZE_spitz = "0x20000" - -IMAGE_FSTYPES ?= "tar.gz jffs2 sum.jffs2" -INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma" +# +# SL-C3000 (16-7 MiB = 576 PEBs) +# 9 x 1024 : 16 = 576 PEBs +# MKUBIFS_ARGS_spitz = "-m 512 -e 15872 -c 576 -x zlib" +# UBINIZE_ARGS_spitz = "-m 512 -p 16384 -s 256" +# ERASEBLOCKSIZE_spitz = "0x4000" + +# UBI: max collie (14.125 = 904 PEBs) +# 14.125 x 1024 : 16 = 904 PEBs +MKUBIFS_ARGS_collie = "-m 512 -e 15872 -c 904 -x zlib" +UBINIZE_ARGS_collie = "-m 512 -p 16384 -s 256" + +# UBI: max poodle (64-7 MiB = 3648 PEBs) +# 57 x 1024 : 16 = 3648 PEBs +MKUBIFS_ARGS_poodle = "-m 512 -e 15872 -c 3648 -x zlib" +UBINIZE_ARGS_poodle = "-m 512 -p 16384 -s 256" + +# UBI: max c7x0 (128-7 MiB = 7744 PEBs) +# 121 x 1024 : 16 = 7744 PEBs +MKUBIFS_ARGS_c7x0 = "-m 512 -e 15872 -c 7744 -x zlib" +UBINIZE_ARGS_c7x0 = "-m 512 -p 16384 -s 256" + +# UBI: max tosa (128-7 MiB = 7744 PEBs) +# 121 x 1024 : 16 = 7744 PEBs +MKUBIFS_ARGS_tosa = "-m 512 -e 15872 -c 7744 -x zlib" +UBINIZE_ARGS_tosa = "-m 512 -p 16384 -s 256" + +# UBI: max akita (128-7 MiB = 968 PEBs) +# 121 x 1024 : 128 = 968 PEBs +MKUBIFS_ARGS_akita = "-m 2048 -e 129024 -c 968 -x zlib" +UBINIZE_ARGS_akita = "-m 2048 -p 131072 -s 512" + +# UBI: max spitz (128-7 MiB = 968 PEBs) +# 121 x 1024 : 128 = 968 PEBs +MKUBIFS_ARGS_spitz = "-m 2048 -e 129024 -c 968 -x zlib" +UBINIZE_ARGS_spitz = "-m 2048 -p 131072 -s 512" # kernel now supports favourlzo EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" -IMAGE_DEVICE_TABLES = "" - ######### # xserver #########
Signature · 1 line
1.7.8.6
PATCH 2/2 zaurus.inc: ensure formfactor is installed in every image
* formfactor.bbappend of meta-handheld will provide rotation reading for psplash.
* This will be removed once formfactor will be a runtime dependency
* of oe-core's psplash.
--- conf/machine/include/zaurus.inc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
conf/machine/include/zaurus.inc +3 -3
@@ -110,8 +110,8 @@ MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" # If set here, each image will also build linux-yocto-tiny-kexecboot and the updater # EXTRA_IMAGEDEPENDS += "zaurus-installer" -# Install /boot/boot.cfg in target images -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg " +# Install /boot/boot.cfg in target images and formfactor (psplash checks rotation) +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg formfactor" # Install kernel and symlink in /boot -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " kernel-base kernel-image " +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " kernel-base kernel-image"
Signature · 1 line
1.7.8.6
Quoted 69 lines · On Thursday 02 August 2012 09:16:48 Andrea Adami wrote:
* In preparation for the next kexecboot release.
* tested on poodle, c7x0 and spitz 3200
* (the different partitioning btw spitz models will be
* detected by kexecbot)Signed-off-by Andrea Adami <[email protected]>--- conf/machine/include/zaurus.inc | 47++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 6 deletions(-)
(quoted diff) +0
-0b/conf/machine/include/zaurus.inc index 45c82d3..899664a 100644
conf/machine/include/zaurus.inc +41
-4@@ -2,22 +2,57 @@ # Zaurus common settings ######################## +IMAGE_FSTYPES ?= "tar.gz jffs2 sum.jffs2 ubifs" +INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma" +IMAGE_DEVICE_TABLES = "" + ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" +ERASEBLOCKSIZE_spitz = "0x20000" # Warning! SL-C3000 has "0x4000" (16MiB NAND) # C3100 and C3200 have same 128MiB NAND device as akita -ERASEBLOCKSIZE_spitz = "0x20000" - -IMAGE_FSTYPES ?= "tar.gz jffs2 sum.jffs2" -INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma" +# +# SL-C3000 (16-7 MiB = 576 PEBs) +# 9 x 1024 : 16 = 576 PEBs +# MKUBIFS_ARGS_spitz = "-m 512 -e 15872 -c 576 -x zlib" +# UBINIZE_ARGS_spitz = "-m 512 -p 16384 -s 256" +# ERASEBLOCKSIZE_spitz = "0x4000" + +# UBI: max collie (14.125 = 904 PEBs) +# 14.125 x 1024 : 16 = 904 PEBs +MKUBIFS_ARGS_collie = "-m 512 -e 15872 -c 904 -x zlib" +UBINIZE_ARGS_collie = "-m 512 -p 16384 -s 256" + +# UBI: max poodle (64-7 MiB = 3648 PEBs) +# 57 x 1024 : 16 = 3648 PEBs +MKUBIFS_ARGS_poodle = "-m 512 -e 15872 -c 3648 -x zlib" +UBINIZE_ARGS_poodle = "-m 512 -p 16384 -s 256" + +# UBI: max c7x0 (128-7 MiB = 7744 PEBs) +# 121 x 1024 : 16 = 7744 PEBs +MKUBIFS_ARGS_c7x0 = "-m 512 -e 15872 -c 7744 -x zlib" +UBINIZE_ARGS_c7x0 = "-m 512 -p 16384 -s 256" + +# UBI: max tosa (128-7 MiB = 7744 PEBs) +# 121 x 1024 : 16 = 7744 PEBs +MKUBIFS_ARGS_tosa = "-m 512 -e 15872 -c 7744 -x zlib" +UBINIZE_ARGS_tosa = "-m 512 -p 16384 -s 256" + +# UBI: max akita (128-7 MiB = 968 PEBs) +# 121 x 1024 : 128 = 968 PEBs +MKUBIFS_ARGS_akita = "-m 2048 -e 129024 -c 968 -x zlib" +UBINIZE_ARGS_akita = "-m 2048 -p 131072 -s 512" + +# UBI: max spitz (128-7 MiB = 968 PEBs) +# 121 x 1024 : 128 = 968 PEBs +MKUBIFS_ARGS_spitz = "-m 2048 -e 129024 -c 968 -x zlib" +UBINIZE_ARGS_spitz = "-m 2048 -p 131072 -s 512"
conf/machine/include/zaurus.inc line 58
Quoted 10 lines
conf/machine/include/zaurus.inc +0
-2# kernel now supports favourlzo EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" -IMAGE_DEVICE_TABLES = "" - ######### # xserver #########
Merged these two to meta-handheld master (with typo kexecbot -> kexecboot in commit message fixed), thanks.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre