[oe] [meta-handheld][PATCH] meta-handheld: adjust EXTRA_IMAGECMD_jffs2 after oe-core changes

[Andrea Adami]

Please disregard this one, there is a typo in simpad.conf.
Take Patch v2 please.


On Tue, Oct 29, 2013 at 12:04 AM, Andrea Adami <andrea.adami at gmail.com> wrote:
> The machine configuration file must specify a customized
> EXTRA_IMAGECMD_jffs2 to override the defaults of image_types.bbclass.
> Images for NOR flashes should be built with cleanmarkers.
>
> Fix the declaration of padding for collie:
> the short form doesn't accept <size> arument
>
> Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
> ---
>  conf/machine/collie.conf     | 2 +-
>  conf/machine/h3600.conf      | 2 ++
>  conf/machine/jornada56x.conf | 2 ++
>  conf/machine/jornada7xx.conf | 4 ++++
>  conf/machine/simpad.conf     | 2 ++
>  5 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
> index 8d1042e..bec8842 100644
> --- a/conf/machine/collie.conf
> +++ b/conf/machine/collie.conf
> @@ -7,7 +7,7 @@ require conf/machine/include/tune-strongarm1100.inc
>
>  JFFS2_ERASEBLOCK = "0x20000"
>
> -EXTRA_IMAGECMD_jffs2 = "-p 14680064 -l -e ${JFFS2_ERASEBLOCK}"
> +EXTRA_IMAGECMD_jffs2 = "--pad=14680064 -l -e ${JFFS2_ERASEBLOCK}"
>
>  # 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 53e10cd..6e9941b 100644
> --- a/conf/machine/h3600.conf
> +++ b/conf/machine/h3600.conf
> @@ -31,6 +31,8 @@ MACHINE_EXTRA_RDEPENDS = "mtd-utils mtd-utils-jffs2"
>  MACHINE_EXTRA_RRECOMMENDS = ""
>
>  JFFS2_ERASEBLOCK = "0x40000"
> +# For NOR flash we need the cleanmarkers so override the defaults
> +EXTRA_IMAGECMD_jffs2 = "-p -l -e ${JFFS2_ERASEBLOCK}"
>  EXTRA_IMAGECMD_jffs2_append = " ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
>
>  #
> diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
> index 746e1eb..645f128 100644
> --- a/conf/machine/jornada56x.conf
> +++ b/conf/machine/jornada56x.conf
> @@ -7,6 +7,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
>  BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools"
>
>  JFFS2_ERASEBLOCK = "0x40000"
> +# For NOR flash we need the cleanmarkers so override the defaults
> +EXTRA_IMAGECMD_jffs2 = "-p -l -e ${JFFS2_ERASEBLOCK}"
>
>  SERIAL_CONSOLE = "115200 ttySA0"
>
> diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
> index d9f05df..c988694 100644
> --- a/conf/machine/jornada7xx.conf
> +++ b/conf/machine/jornada7xx.conf
> @@ -8,6 +8,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
>  MACHINE_FEATURES = "apm alsa pcmcia irda keyboard touchscreen screen vfat"
>  MACHINE_EXTRA_RDEPENDS = "kernel-modules bluez-dtl1-workaround"
>
> +JFFS2_ERASEBLOCK = "0x40000"
> +# For NOR flash we need the cleanmarkers so override the defaults
> +EXTRA_IMAGECMD_jffs2 = "-p -l -e ${JFFS2_ERASEBLOCK}"
> +
>  #screeninfo
>  MACHINE_GUI_CLASS = "smallscreen"
>  MACHINE_DISPLAY_WIDTH_PIXELS = "640"
> diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
> index d5ee19c..a6d49a5 100644
> --- a/conf/machine/simpad.conf
> +++ b/conf/machine/simpad.conf
> @@ -9,6 +9,8 @@ MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
>  PREFERRED_PROVIDER_virtual/kernel = "linux"
>
>  JFFS2_ERASEBLOCK = "0x20000"
> +# For NOR flash we need the cleanmarkers so override the defaults
> +EXTRA_IMAGECMD.jffs2 = "-p -l -e ${JFFS2_ERASEBLOCK}"
>
>  MACHINE_GUI_CLASS = "bigscreen"
>  MACHINE_DISPLAY_WIDTH_PIXELS = "800"
> --
> 1.8.1.5
>