mmc: omap_hsmmc: Add support to set IODELAY values

[people/ms/u-boot.git] / cmd / mtdparts.c

diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 615aa7459af3b68967fd8eae483e126724c583d6..9bc977450cf8910aae84c2b6c225c27f2e651402 100644 (file)
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -81,7 +81,7 @@
 #include <linux/mtd/mtd.h>
 
 #if defined(CONFIG_CMD_NAND)
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <nand.h>
 #endif
 
@@ -133,9 +133,9 @@ static const char *mtdparts_default = MTDPARTS_DEFAULT;
 #define MTDIDS_MAXLEN          128
 #define MTDPARTS_MAXLEN                512
 #define PARTITION_MAXLEN       16
-static char last_ids[MTDIDS_MAXLEN];
-static char last_parts[MTDPARTS_MAXLEN];
-static char last_partition[PARTITION_MAXLEN];
+static char last_ids[MTDIDS_MAXLEN + 1];
+static char last_parts[MTDPARTS_MAXLEN + 1];
+static char last_partition[PARTITION_MAXLEN + 1];
 
 /* low level jffs2 cache cleaning routine */
 extern void jffs2_free_cache(struct part_info *part);
@@ -240,15 +240,22 @@ static void index_partitions(void)
                        if (dev == current_mtd_dev) {
                                mtddevnum += current_mtd_partnum;
                                env_set_ulong("mtddevnum", mtddevnum);
+                               debug("=> mtddevnum %d,\n", mtddevnum);
                                break;
                        }
                        mtddevnum += dev->num_parts;
                }
 
                part = mtd_part_info(current_mtd_dev, current_mtd_partnum);
-               env_set("mtddevname", part->name);
+               if (part) {
+                       env_set("mtddevname", part->name);
+
+                       debug("=> mtddevname %s\n", part->name);
+               } else {
+                       env_set("mtddevname", NULL);
 
-               debug("=> mtddevnum %d,\n=> mtddevname %s\n", mtddevnum, part->name);
+                       debug("=> mtddevname NULL\n");
+               }
        } else {
                env_set("mtddevnum", NULL);
                env_set("mtddevname", NULL);
@@ -866,15 +873,12 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_
                return 1;
        }
 
-#ifdef DEBUG
        pend = strchr(p, ';');
-#endif
        debug("dev type = %d (%s), dev num = %d, mtd-id = %s\n",
                        id->type, MTD_DEV_TYPE(id->type),
                        id->num, id->mtd_id);
        debug("parsing partitions %.*s\n", (int)(pend ? pend - p : strlen(p)), p);
 
-
        /* parse partitions */
        num_parts = 0;
 
@@ -912,12 +916,6 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_
                return 1;
        }
 
-       if (num_parts == 0) {
-               printf("no partitions for device %s%d (%s)\n",
-                               MTD_DEV_TYPE(id->type), id->num, id->mtd_id);
-               return 1;
-       }
-
        debug("\ntotal partitions: %d\n", num_parts);
 
        /* check for next device presence */
@@ -1593,8 +1591,10 @@ static int parse_mtdparts(const char *const mtdparts)
                list_add_tail(&dev->link, &devices);
                err = 0;
        }
-       if (err == 1)
+       if (err == 1) {
+               free(dev);
                device_delall(&devices);
+       }
 
        return err;
 }
@@ -1723,16 +1723,16 @@ int mtdparts_init(void)
        const char *ids, *parts;
        const char *current_partition;
        int ids_changed;
-       char tmp_ep[PARTITION_MAXLEN];
+       char tmp_ep[PARTITION_MAXLEN + 1];
        char tmp_parts[MTDPARTS_MAXLEN];
 
        debug("\n---mtdparts_init---\n");
        if (!initialized) {
                INIT_LIST_HEAD(&mtdids);
                INIT_LIST_HEAD(&devices);
-               memset(last_ids, 0, MTDIDS_MAXLEN);
-               memset(last_parts, 0, MTDPARTS_MAXLEN);
-               memset(last_partition, 0, PARTITION_MAXLEN);
+               memset(last_ids, 0, sizeof(last_ids));
+               memset(last_parts, 0, sizeof(last_parts));
+               memset(last_partition, 0, sizeof(last_partition));
 #if defined(CONFIG_SYS_MTDPARTS_RUNTIME)
                board_mtdparts_default(&mtdids_default, &mtdparts_default);
 #endif
@@ -1747,7 +1747,8 @@ int mtdparts_init(void)
 
        /* save it for later parsing, cannot rely on current partition pointer
         * as 'partition' variable may be updated during init */
-       tmp_ep[0] = '\0';
+       memset(tmp_parts, 0, sizeof(tmp_parts));
+       memset(tmp_ep, 0, sizeof(tmp_ep));
        if (current_partition)
                strncpy(tmp_ep, current_partition, PARTITION_MAXLEN);