Merge branch 'master' of git://git.denx.de/u-boot-imx

[u-boot] / drivers / dfu / dfu.c

diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 6842aef420f42d848d30789be55047ce12c6c58d..ceb33e35eed212e837a2f5571cea86f70c135806 100644 (file)
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -35,7 +35,11 @@ static struct hash_algo *dfu_hash_algo;
  */
 __weak bool dfu_usb_get_reset(void)
 {
+#ifdef CONFIG_SPL_DFU_NO_RESET
+       return false;
+#else
        return true;
+#endif
 }
 
 static int dfu_find_alt_num(const char *s)
@@ -338,17 +342,6 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)
                dfu->r_left = dfu->get_medium_size(dfu);
                if (dfu->r_left < 0)
                        return dfu->r_left;
-               switch (dfu->layout) {
-               case DFU_RAW_ADDR:
-               case DFU_RAM_ADDR:
-                       break;
-               default:
-                       if (dfu->r_left > dfu_buf_size) {
-                               printf("%s: File too big for buffer\n",
-                                      __func__);
-                               return -EOVERFLOW;
-                       }
-               }
 
                debug("%s: %s %ld [B]\n", __func__, dfu->name, dfu->r_left);
 
@@ -479,8 +472,10 @@ int dfu_config_entities(char *env, char *interface, char *devstr)
                s = strsep(&env, ";");
                ret = dfu_fill_entity(&dfu[i], s, alt_num_cnt, interface,
                                      devstr);
-               if (ret)
+               if (ret) {
+                       free(dfu);
                        return -1;
+               }
 
                list_add_tail(&dfu[i].list, &dfu_list);
                alt_num_cnt++;
@@ -491,7 +486,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr)
 
 const char *dfu_get_dev_type(enum dfu_device_type t)
 {
-       const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM" };
+       const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM", "SF" };
        return dev_t[t];
 }