Dear Heiko Schocher,
> updating an ubi partition needs a completely erased mtd partition,
> see:
> http://lists.infradead.org/pipermail/linux-mtd/2011-May/035416.html
>
> So, add partubi alt setting for the dfu_alt_info environment
> variable to mark this partition as an ubi partition. In case we
> update an ubi partition, we erase after flashing the image into the
> partition, the remaining sektors.
>
> Signed-off-by: Heiko Schocher <h...@denx.de>
> Cc: Pantelis Antoniou <pa...@antoniou-consulting.com>
> Cc: Tom Rini <tr...@ti.com>
> Cc: Lukasz Majewski <l.majew...@samsung.com>
> Cc: Kyungmin Park <kyungmin.p...@samsung.com>
> Cc: Marek Vasut <ma...@denx.de>
> Cc: Wolfgang Denk <w...@denx.de>
>
> ---
>
> - This patch is also a good starting point to fix up updating ubi, as
> we currently use "nand erase" for erasing the sektors. This is
> not the prefered way for writing an ubi image, see:
> http://www.linux-mtd.infradead.org/faq/ubi.html#L_flash_img
>
> This must be fixed ... we have no "ubiformat" in u-boot, or?
>
> - changes for v2:
> - do not use spread = 1 for nand_erase_opts, to prevent
> errormessage if there are bad blocks in the erase range.
> ---
> drivers/dfu/dfu.c | 30 +++++++++++++++++++++++++++++-
> drivers/dfu/dfu_nand.c | 26 ++++++++++++++++++++++++++
> include/dfu.h | 2 ++
> 3 Dateien geändert, 57 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
>
> diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
> index 0521752..7ba7026 100644
> --- a/drivers/dfu/dfu.c
> +++ b/drivers/dfu/dfu.c
> @@ -23,6 +23,7 @@
> #include <errno.h>
> #include <malloc.h>
> #include <mmc.h>
> +#include <nand.h>
> #include <fat.h>
> #include <dfu.h>
> #include <linux/list.h>
> @@ -176,6 +177,34 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int
> size, int blk_seq_num) ret = dfu->flush_medium(dfu);
> printf("\nDFU complete CRC32: 0x%08x\n", dfu->crc);
>
> + /* in case of ubi partition, erase rest of the partition */
> + if (dfu->ubi == 1) {
> + int ret;
> + nand_info_t *nand;
> + /* erase complete partition */
> + nand_erase_options_t opts;
> +
> + if (nand_curr_device < 0 ||
> + nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
> + !nand_info[nand_curr_device].name) {
> + printf("%s: invalid nand device\n", __func__);
> + return -1;
> + }
> +
> + nand = &nand_info[nand_curr_device];
> +
> + memset(&opts, 0, sizeof(opts));
> + opts.offset = dfu->data.nand.start + dfu->offset +
> + dfu->bad_skip;
> + opts.length = dfu->data.nand.start +
> + dfu->data.nand.size - opts.offset;
> + ret = nand_erase_opts(nand, &opts);
> + if (ret != 0) {
> + printf("Failure erase: %d\n", ret);
> + return ret;
Are you not leaking memory here ? I suspect you should call dfu_free_buf() as
below ?
> + }
> + }
> +
> /* clear everything */
> dfu_free_buf();
> dfu->crc = 0;
> @@ -186,7 +215,6 @@ int dfu_write(struct dfu_entity *dfu, void *buf, int
> size, int blk_seq_num) dfu->i_buf = dfu->i_buf_start;
>
> dfu->inited = 0;
> -
> }
>
> return ret = 0 ? size : ret;
> diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
> index 07dee89..d8afc48 100644
> --- a/drivers/dfu/dfu_nand.c
> +++ b/drivers/dfu/dfu_nand.c
> @@ -153,6 +153,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char
> *s) char *st;
> int ret, dev, part;
>
> + dfu->ubi = 0;
> dfu->dev_type = DFU_DEV_NAND;
> st = strsep(&s, " ");
> if (!strcmp(st, "raw")) {
> @@ -185,7 +186,32 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char
> *s)
>
> dfu->data.nand.start = pi->offset;
> dfu->data.nand.size = pi->size;
> + } else if (!strcmp(st, "partubi")) {
> + char mtd_id[32];
> + struct mtd_device *mtd_dev;
> + u8 part_num;
> + struct part_info *pi;
> +
> + dfu->layout = DFU_RAW_ADDR;
>
> + dev = simple_strtoul(s, &s, 10);
> + s++;
> + part = simple_strtoul(s, &s, 10);
> +
> + sprintf(mtd_id, "%s%d,%d", "nand", dev, part - 1);
> + printf("using id '%s'\n", mtd_id);
> +
> + mtdparts_init();
> +
> + ret = find_dev_and_part(mtd_id, &mtd_dev, &part_num, &pi);
> + if (ret != 0) {
> + printf("Could not locate '%s'\n", mtd_id);
> + return -1;
> + }
> +
> + dfu->data.nand.start = pi->offset;
> + dfu->data.nand.size = pi->size;
> + dfu->ubi = 1;
> } else {
> printf("%s: Memory layout (%s) not supported!\n", __func__, st);
> return -1;
> diff --git a/include/dfu.h b/include/dfu.h
> index 124653c..7bbe42d 100644
> --- a/include/dfu.h
> +++ b/include/dfu.h
> @@ -111,6 +111,8 @@ struct dfu_entity {
> u32 bad_skip; /* for nand use */
>
> unsigned int inited:1;
> + /* for nand/ubi use */
> + unsigned int ubi:1;
> };
>
> int dfu_config_entities(char *s, char *interface, int num);
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
