usb: dfu: make nand upload working

[karo-tx-uboot.git] / drivers / dfu / dfu_nand.c

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 2a01cc11b80546a39162e5b7c8485cdef72791d0..2d07097e850af70544d95f5481d6d5af9ef26f5c 100644 (file)
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -19,12 +19,7 @@
 #include <jffs2/load_kernel.h>
 #include <nand.h>
 
-enum dfu_nand_op {
-       DFU_OP_READ = 1,
-       DFU_OP_WRITE,
-};
-
-static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu,
+static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
                        u64 offset, void *buf, long *len)
 {
        loff_t start, lim;
@@ -126,6 +121,7 @@ static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
 
        switch (dfu->layout) {
        case DFU_RAW_ADDR:
+               *len = dfu->data.nand.size;
                ret = nand_block_read(dfu, offset, buf, len);
                break;
        default:
@@ -136,11 +132,43 @@ static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
        return ret;
 }
 
+static int dfu_flush_medium_nand(struct dfu_entity *dfu)
+{
+       int ret = 0;
+
+       /* in case of ubi partition, erase rest of the partition */
+       if (dfu->data.nand.ubi) {
+               nand_info_t *nand;
+               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;
+}
+
 int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
 {
        char *st;
        int ret, dev, part;
 
+       dfu->data.nand.ubi = 0;
        dfu->dev_type = DFU_DEV_NAND;
        st = strsep(&s, " ");
        if (!strcmp(st, "raw")) {
@@ -148,7 +176,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
                dfu->data.nand.start = simple_strtoul(s, &s, 16);
                s++;
                dfu->data.nand.size = simple_strtoul(s, &s, 16);
-       } else if (!strcmp(st, "part")) {
+       } else if ((!strcmp(st, "part")) || (!strcmp(st, "partubi"))) {
                char mtd_id[32];
                struct mtd_device *mtd_dev;
                u8 part_num;
@@ -173,7 +201,8 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
 
                dfu->data.nand.start = pi->offset;
                dfu->data.nand.size = pi->size;
-
+               if (!strcmp(st, "partubi"))
+                       dfu->data.nand.ubi = 1;
        } else {
                printf("%s: Memory layout (%s) not supported!\n", __func__, st);
                return -1;
@@ -181,6 +210,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
 
        dfu->read_medium = dfu_read_medium_nand;
        dfu->write_medium = dfu_write_medium_nand;
+       dfu->flush_medium = dfu_flush_medium_nand;
 
        /* initial state */
        dfu->inited = 0;