Separate mtdparts command from jffs2

Currently the mtdparts commands are included in the jffs2 command support.
This doesn't make sense anymore since other commands (e.g. UBI) use this
infrastructure as well now. This patch separates the mtdparts commands from
the jffs2 commands making it possible to only select mtdparts when no JFFS2
support is needed.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

81 files changed, 2122 insertions, 1852 deletions

diff --git a/README b/README
index 46181a4bcd..32d9acdd21 100644
--- a/README
+++ b/README
@@ -636,6 +636,7 @@ The following options need to be configured:
 		CONFIG_CMD_MISC		  Misc functions like sleep etc
 		CONFIG_CMD_MMC		* MMC memory mapped support
 		CONFIG_CMD_MII		* MII utility commands
+		CONFIG_CMD_MTDPARTS	* MTD partition support
 		CONFIG_CMD_NAND		* NAND support
 		CONFIG_CMD_NET		  bootp, tftpboot, rarpboot
 		CONFIG_CMD_PCA953X	* PCA953x I2C gpio commands
diff --git a/board/fads/fads.h b/board/fads/fads.h
index 24e43eab3f..4ab4b2615a 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -241,7 +241,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -249,7 +249,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=fads0,nor1=fads-1,nor2=fads-2,nor3=fads-3"
 #define MTDPARTS_DEFAULT	"mtdparts=fads-0:-@1m(user1),fads-1:-(user2),fads-2:-(user3),fads-3:-(user4)"
 */
diff --git a/common/Makefile b/common/Makefile
index f13cd11b9a..7237ff4795 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -110,6 +110,7 @@ COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
 COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
 COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
 COBJS-$(CONFIG_MP) += cmd_mp.o
+COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o
 COBJS-y += cmd_nand.o
 COBJS-$(CONFIG_CMD_NET) += cmd_net.o
 COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index 510654e1ae..f1f3517b12 100644
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -31,12 +31,12 @@
 #include <dataflash.h>
 #endif
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>
 
 /* parition handling routines */
 int mtdparts_init(void);
-int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
+int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
 int find_dev_and_part(const char *id, struct mtd_device **dev,
 		u8 *part_num, struct part_info **part);
 #endif
@@ -325,7 +325,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	flash_info_t *info;
 	ulong bank, addr_first, addr_last;
 	int n, sect_first, sect_last;
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 	struct mtd_device *dev;
 	struct part_info *part;
 	u8 dev_type, dev_num, pnum;
@@ -357,9 +357,9 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		return rcode;
 	}
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 	/* erase <part-id> - erase partition */
-	if ((argc == 2) && (id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
+	if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
 		mtdparts_init();
 		if (find_dev_and_part(argv[1], &dev, &pnum, &part) == 0) {
 			if (dev->id->type == MTD_DEV_TYPE_NOR) {
@@ -470,7 +470,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif /* CONFIG_SYS_NO_FLASH */
 	ulong addr_first, addr_last;
 	int p;
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 	struct mtd_device *dev;
 	struct part_info *part;
 	u8 dev_type, dev_num, pnum;
@@ -563,9 +563,9 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		return rcode;
 	}
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 	/* protect on/off <part-id> */
-	if ((argc == 3) && (id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
+	if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
 		mtdparts_init();
 		if (find_dev_and_part(argv[2], &dev, &pnum, &part) == 0) {
 			if (dev->id->type == MTD_DEV_TYPE_NOR) {
@@ -698,7 +698,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
 
 
 /**************************************************/
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 # define TMP_ERASE	"erase <part-id>\n    - erase partition\n"
 # define TMP_PROT_ON	"protect on <part-id>\n    - protect partition\n"
 # define TMP_PROT_OFF	"protect off <part-id>\n    - make partition writable\n"
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index d0a7ceaa58..860d1d97e3 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -136,40 +136,6 @@
  * field for read-only partitions */
 #define MTD_WRITEABLE_CMD		1
 
-#ifdef CONFIG_JFFS2_CMDLINE
-/* default values for mtdids and mtdparts variables */
-#if defined(MTDIDS_DEFAULT)
-static const char *const mtdids_default = MTDIDS_DEFAULT;
-#else
-#warning "MTDIDS_DEFAULT not defined!"
-static const char *const mtdids_default = NULL;
-#endif
-
-#if defined(MTDPARTS_DEFAULT)
-static const char *const mtdparts_default = MTDPARTS_DEFAULT;
-#else
-#warning "MTDPARTS_DEFAULT not defined!"
-static const char *const mtdparts_default = NULL;
-#endif
-
-/* copies of last seen 'mtdids', 'mtdparts' and 'partition' env variables */
-#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];
-
-/* low level jffs2 cache cleaning routine */
-extern void jffs2_free_cache(struct part_info *part);
-
-/* mtdids mapping list, filled by parse_ids() */
-struct list_head mtdids;
-
-/* device/partition list, parse_cmdline() parses into here */
-struct list_head devices;
-#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
-
 /* current active device and partition number */
 static struct mtd_device *current_dev = NULL;
 static u8 current_partnum = 0;
@@ -188,601 +154,14 @@ extern int cramfs_info (struct part_info *info);
 #define cramfs_info(x)		(0)
 #endif
 
-static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int part_num);
-
-/* command line only routines */
-#ifdef CONFIG_JFFS2_CMDLINE
-
-static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_len);
-static int device_del(struct mtd_device *dev);
-
-/**
- * Parses a string into a number.  The number stored at ptr is
- * potentially suffixed with K (for kilobytes, or 1024 bytes),
- * M (for megabytes, or 1048576 bytes), or G (for gigabytes, or
- * 1073741824).  If the number is suffixed with K, M, or G, then
- * the return value is the number multiplied by one kilobyte, one
- * megabyte, or one gigabyte, respectively.
- *
- * @param ptr where parse begins
- * @param retptr output pointer to next char after parse completes (output)
- * @return resulting unsigned int
- */
-static unsigned long memsize_parse (const char *const ptr, const char **retptr)
-{
-	unsigned long ret = simple_strtoul(ptr, (char **)retptr, 0);
-
-	switch (**retptr) {
-		case 'G':
-		case 'g':
-			ret <<= 10;
-		case 'M':
-		case 'm':
-			ret <<= 10;
-		case 'K':
-		case 'k':
-			ret <<= 10;
-			(*retptr)++;
-		default:
-			break;
-	}
-
-	return ret;
-}
-
-/**
- * Format string describing supplied size. This routine does the opposite job
- * to memsize_parse(). Size in bytes is converted to string and if possible
- * shortened by using k (kilobytes), m (megabytes) or g (gigabytes) suffix.
- *
- * Note, that this routine does not check for buffer overflow, it's the caller
- * who must assure enough space.
- *
- * @param buf output buffer
- * @param size size to be converted to string
- */
-static void memsize_format(char *buf, u32 size)
-{
-#define SIZE_GB ((u32)1024*1024*1024)
-#define SIZE_MB ((u32)1024*1024)
-#define SIZE_KB ((u32)1024)
-
-	if ((size % SIZE_GB) == 0)
-		sprintf(buf, "%ug", size/SIZE_GB);
-	else if ((size % SIZE_MB) == 0)
-		sprintf(buf, "%um", size/SIZE_MB);
-	else if (size % SIZE_KB == 0)
-		sprintf(buf, "%uk", size/SIZE_KB);
-	else
-		sprintf(buf, "%u", size);
-}
-
-/**
- * This routine does global indexing of all partitions. Resulting index for
- * current partition is saved in 'mtddevnum'. Current partition name in
- * 'mtddevname'.
- */
-static void index_partitions(void)
-{
-	char buf[16];
-	u16 mtddevnum;
-	struct part_info *part;
-	struct list_head *dentry;
-	struct mtd_device *dev;
-
-	DEBUGF("--- index partitions ---\n");
-
-	if (current_dev) {
-		mtddevnum = 0;
-		list_for_each(dentry, &devices) {
-			dev = list_entry(dentry, struct mtd_device, link);
-			if (dev == current_dev) {
-				mtddevnum += current_partnum;
-				sprintf(buf, "%d", mtddevnum);
-				setenv("mtddevnum", buf);
-				break;
-			}
-			mtddevnum += dev->num_parts;
-		}
-
-		part = jffs2_part_info(current_dev, current_partnum);
-		setenv("mtddevname", part->name);
-
-		DEBUGF("=> mtddevnum %d,\n=> mtddevname %s\n", mtddevnum, part->name);
-	} else {
-		setenv("mtddevnum", NULL);
-		setenv("mtddevname", NULL);
-
-		DEBUGF("=> mtddevnum NULL\n=> mtddevname NULL\n");
-	}
-}
-
-/**
- * Save current device and partition in environment variable 'partition'.
- */
-static void current_save(void)
-{
-	char buf[16];
-
-	DEBUGF("--- current_save ---\n");
-
-	if (current_dev) {
-		sprintf(buf, "%s%d,%d", MTD_DEV_TYPE(current_dev->id->type),
-					current_dev->id->num, current_partnum);
-
-		setenv("partition", buf);
-		strncpy(last_partition, buf, 16);
-
-		DEBUGF("=> partition %s\n", buf);
-	} else {
-		setenv("partition", NULL);
-		last_partition[0] = '\0';
-
-		DEBUGF("=> partition NULL\n");
-	}
-	index_partitions();
-}
-
-/**
- * Performs sanity check for supplied NOR flash partition. Table of existing
- * NOR flash devices is searched and partition device is located. Alignment
- * with the granularity of NOR flash sectors is verified.
- *
- * @param id of the parent device
- * @param part partition to validate
- * @return 0 if partition is valid, 1 otherwise
- */
-static int part_validate_nor(struct mtdids *id, struct part_info *part)
-{
-#if defined(CONFIG_CMD_FLASH)
-	/* info for FLASH chips */
-	extern flash_info_t flash_info[];
-	flash_info_t *flash;
-	int offset_aligned;
-	u32 end_offset, sector_size = 0;
-	int i;
-
-	flash = &flash_info[id->num];
-
-	/* size of last sector */
-	part->sector_size = flash->size -
-		(flash->start[flash->sector_count-1] - flash->start[0]);
-
-	offset_aligned = 0;
-	for (i = 0; i < flash->sector_count; i++) {
-		if ((flash->start[i] - flash->start[0]) == part->offset) {
-			offset_aligned = 1;
-			break;
-		}
-	}
-	if (offset_aligned == 0) {
-		printf("%s%d: partition (%s) start offset alignment incorrect\n",
-				MTD_DEV_TYPE(id->type), id->num, part->name);
-		return 1;
-	}
-
-	end_offset = part->offset + part->size;
-	offset_aligned = 0;
-	for (i = 0; i < flash->sector_count; i++) {
-		if (i) {
-			sector_size = flash->start[i] - flash->start[i-1];
-			if (part->sector_size < sector_size)
-				part->sector_size = sector_size;
-		}
-		if ((flash->start[i] - flash->start[0]) == end_offset)
-			offset_aligned = 1;
-	}
-
-	if (offset_aligned || flash->size == end_offset)
-		return 0;
-
-	printf("%s%d: partition (%s) size alignment incorrect\n",
-			MTD_DEV_TYPE(id->type), id->num, part->name);
-#endif
-	return 1;
-}
-
-/**
- * Performs sanity check for supplied NAND flash partition. Table of existing
- * NAND flash devices is searched and partition device is located. Alignment
- * with the granularity of nand erasesize is verified.
- *
- * @param id of the parent device
- * @param part partition to validate
- * @return 0 if partition is valid, 1 otherwise
- */
-static int part_validate_nand(struct mtdids *id, struct part_info *part)
-{
-#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
-	/* info for NAND chips */
-	nand_info_t *nand;
-
-	nand = &nand_info[id->num];
-
-	part->sector_size = nand->erasesize;
-
-	if ((unsigned long)(part->offset) % nand->erasesize) {
-		printf("%s%d: partition (%s) start offset alignment incorrect\n",
-				MTD_DEV_TYPE(id->type), id->num, part->name);
-		return 1;
-	}
-
-	if (part->size % nand->erasesize) {
-		printf("%s%d: partition (%s) size alignment incorrect\n",
-				MTD_DEV_TYPE(id->type), id->num, part->name);
-		return 1;
-	}
-
-	return 0;
-#else
-	return 1;
-#endif
-}
-
-/**
- * Performs sanity check for supplied OneNAND flash partition.
- * Table of existing OneNAND flash devices is searched and partition device
- * is located. Alignment with the granularity of nand erasesize is verified.
- *
- * @param id of the parent device
- * @param part partition to validate
- * @return 0 if partition is valid, 1 otherwise
- */
-static int part_validate_onenand(struct mtdids *id, struct part_info *part)
-{
-#if defined(CONFIG_CMD_ONENAND)
-	/* info for OneNAND chips */
-	struct mtd_info *mtd;
-
-	mtd = &onenand_mtd;
-
-	part->sector_size = mtd->erasesize;
-
-	if ((unsigned long)(part->offset) % mtd->erasesize) {
-		printf("%s%d: partition (%s) start offset"
-			"alignment incorrect\n",
-				MTD_DEV_TYPE(id->type), id->num, part->name);
-		return 1;
-	}
-
-	if (part->size % mtd->erasesize) {
-		printf("%s%d: partition (%s) size alignment incorrect\n",
-				MTD_DEV_TYPE(id->type), id->num, part->name);
-		return 1;
-	}
-
-	return 0;
-#else
-	return 1;
-#endif
-}
-
-
-/**
- * Performs sanity check for supplied partition. Offset and size are verified
- * to be within valid range. Partition type is checked and either
- * parts_validate_nor() or parts_validate_nand() is called with the argument
- * of part.
- *
- * @param id of the parent device
- * @param part partition to validate
- * @return 0 if partition is valid, 1 otherwise
- */
-static int part_validate(struct mtdids *id, struct part_info *part)
-{
-	if (part->size == SIZE_REMAINING)
-		part->size = id->size - part->offset;
-
-	if (part->offset > id->size) {
-		printf("%s: offset %08x beyond flash size %08x\n",
-				id->mtd_id, part->offset, id->size);
-		return 1;
-	}
-
-	if ((part->offset + part->size) <= part->offset) {
-		printf("%s%d: partition (%s) size too big\n",
-				MTD_DEV_TYPE(id->type), id->num, part->name);
-		return 1;
-	}
-
-	if (part->offset + part->size > id->size) {
-		printf("%s: partitioning exceeds flash size\n", id->mtd_id);
-		return 1;
-	}
-
-	if (id->type == MTD_DEV_TYPE_NAND)
-		return part_validate_nand(id, part);
-	else if (id->type == MTD_DEV_TYPE_NOR)
-		return part_validate_nor(id, part);
-	else if (id->type == MTD_DEV_TYPE_ONENAND)
-		return part_validate_onenand(id, part);
-	else
-		DEBUGF("part_validate: invalid dev type\n");
-
-	return 1;
-}
-
-/**
- * Delete selected partition from the partion list of the specified device.
- *
- * @param dev device to delete partition from
- * @param part partition to delete
- * @return 0 on success, 1 otherwise
- */
-static int part_del(struct mtd_device *dev, struct part_info *part)
-{
-	u8 current_save_needed = 0;
-
-	/* if there is only one partition, remove whole device */
-	if (dev->num_parts == 1)
-		return device_del(dev);
-
-	/* otherwise just delete this partition */
-
-	if (dev == current_dev) {
-		/* we are modyfing partitions for the current device,
-		 * update current */
-		struct part_info *curr_pi;
-		curr_pi = jffs2_part_info(current_dev, current_partnum);
-
-		if (curr_pi) {
-			if (curr_pi == part) {
-				printf("current partition deleted, resetting current to 0\n");
-				current_partnum = 0;
-			} else if (part->offset <= curr_pi->offset) {
-				current_partnum--;
-			}
-			current_save_needed = 1;
-		}
-	}
-
-#ifdef CONFIG_NAND_LEGACY
-	jffs2_free_cache(part);
-#endif
-	list_del(&part->link);
-	free(part);
-	dev->num_parts--;
-
-	if (current_save_needed > 0)
-		current_save();
-	else
-		index_partitions();
-
-	return 0;
-}
-
-/**
- * Delete all partitions from parts head list, free memory.
- *
- * @param head list of partitions to delete
- */
-static void part_delall(struct list_head *head)
-{
-	struct list_head *entry, *n;
-	struct part_info *part_tmp;
-
-	/* clean tmp_list and free allocated memory */
-	list_for_each_safe(entry, n, head) {
-		part_tmp = list_entry(entry, struct part_info, link);
-
-#ifdef CONFIG_NAND_LEGACY
-		jffs2_free_cache(part_tmp);
-#endif
-		list_del(entry);
-		free(part_tmp);
-	}
-}
-
-/**
- * Add new partition to the supplied partition list. Make sure partitions are
- * sorted by offset in ascending order.
- *
- * @param head list this partition is to be added to
- * @param new partition to be added
- */
-static int part_sort_add(struct mtd_device *dev, struct part_info *part)
-{
-	struct list_head *entry;
-	struct part_info *new_pi, *curr_pi;
-
-	/* link partition to parrent dev */
-	part->dev = dev;
-
-	if (list_empty(&dev->parts)) {
-		DEBUGF("part_sort_add: list empty\n");
-		list_add(&part->link, &dev->parts);
-		dev->num_parts++;
-		index_partitions();
-		return 0;
-	}
-
-	new_pi = list_entry(&part->link, struct part_info, link);
-
-	/* get current partition info if we are updating current device */
-	curr_pi = NULL;
-	if (dev == current_dev)
-		curr_pi = jffs2_part_info(current_dev, current_partnum);
-
-	list_for_each(entry, &dev->parts) {
-		struct part_info *pi;
-
-		pi = list_entry(entry, struct part_info, link);
-
-		/* be compliant with kernel cmdline, allow only one partition at offset zero */
-		if ((new_pi->offset == pi->offset) && (pi->offset == 0)) {
-			printf("cannot add second partition at offset 0\n");
-			return 1;
-		}
-
-		if (new_pi->offset <= pi->offset) {
-			list_add_tail(&part->link, entry);
-			dev->num_parts++;
-
-			if (curr_pi && (pi->offset <= curr_pi->offset)) {
-				/* we are modyfing partitions for the current
-				 * device, update current */
-				current_partnum++;
-				current_save();
-			} else {
-				index_partitions();
-			}
-			return 0;
-		}
-	}
-
-	list_add_tail(&part->link, &dev->parts);
-	dev->num_parts++;
-	index_partitions();
-	return 0;
-}
-
-/**
- * Add provided partition to the partition list of a given device.
- *
- * @param dev device to which partition is added
- * @param part partition to be added
- * @return 0 on success, 1 otherwise
- */
-static int part_add(struct mtd_device *dev, struct part_info *part)
-{
-	/* verify alignment and size */
-	if (part_validate(dev->id, part) != 0)
-		return 1;
-
-	/* partition is ok, add it to the list */
-	if (part_sort_add(dev, part) != 0)
-		return 1;
-
-	return 0;
-}
-
-/**
- * Parse one partition definition, allocate memory and return pointer to this
- * location in retpart.
- *
- * @param partdef pointer to the partition definition string i.e. <part-def>
- * @param ret output pointer to next char after parse completes (output)
- * @param retpart pointer to the allocated partition (output)
- * @return 0 on success, 1 otherwise
- */
-static int part_parse(const char *const partdef, const char **ret, struct part_info **retpart)
-{
-	struct part_info *part;
-	unsigned long size;
-	unsigned long offset;
-	const char *name;
-	int name_len;
-	unsigned int mask_flags;
-	const char *p;
-
-	p = partdef;
-	*retpart = NULL;
-	*ret = NULL;
-
-	/* fetch the partition size */
-	if (*p == '-') {
-		/* assign all remaining space to this partition */
-		DEBUGF("'-': remaining size assigned\n");
-		size = SIZE_REMAINING;
-		p++;
-	} else {
-		size = memsize_parse(p, &p);
-		if (size < MIN_PART_SIZE) {
-			printf("partition size too small (%lx)\n", size);
-			return 1;
-		}
-	}
-
-	/* check for offset */
-	offset = OFFSET_NOT_SPECIFIED;
-	if (*p == '@') {
-		p++;
-		offset = memsize_parse(p, &p);
-	}
-
-	/* now look for the name */
-	if (*p == '(') {
-		name = ++p;
-		if ((p = strchr(name, ')')) == NULL) {
-			printf("no closing ) found in partition name\n");
-			return 1;
-		}
-		name_len = p - name + 1;
-		if ((name_len - 1) == 0) {
-			printf("empty partition name\n");
-			return 1;
-		}
-		p++;
-	} else {
-		/* 0x00000000@0x00000000 */
-		name_len = 22;
-		name = NULL;
-	}
-
-	/* test for options */
-	mask_flags = 0;
-	if (strncmp(p, "ro", 2) == 0) {
-		mask_flags |= MTD_WRITEABLE_CMD;
-		p += 2;
-	}
-
-	/* check for next partition definition */
-	if (*p == ',') {
-		if (size == SIZE_REMAINING) {
-			*ret = NULL;
-			printf("no partitions allowed after a fill-up partition\n");
-			return 1;
-		}
-		*ret = ++p;
-	} else if ((*p == ';') || (*p == '\0')) {
-		*ret = p;
-	} else {
-		printf("unexpected character '%c' at the end of partition\n", *p);
-		*ret = NULL;
-		return 1;
-	}
-
-	/*  allocate memory */
-	part = (struct part_info *)malloc(sizeof(struct part_info) + name_len);
-	if (!part) {
-		printf("out of memory\n");
-		return 1;
-	}
-	memset(part, 0, sizeof(struct part_info) + name_len);
-	part->size = size;
-	part->offset = offset;
-	part->mask_flags = mask_flags;
-	part->name = (char *)(part + 1);
-
-	if (name) {
-		/* copy user provided name */
-		strncpy(part->name, name, name_len - 1);
-		part->auto_name = 0;
-	} else {
-		/* auto generated name in form of size@offset */
-		sprintf(part->name, "0x%08lx@0x%08lx", size, offset);
-		part->auto_name = 1;
-	}
-
-	part->name[name_len - 1] = '\0';
-	INIT_LIST_HEAD(&part->link);
-
-	DEBUGF("+ partition: name %-22s size 0x%08x offset 0x%08x mask flags %d\n",
-			part->name, part->size,
-			part->offset, part->mask_flags);
-
-	*retpart = part;
-	return 0;
-}
-#endif/* #ifdef CONFIG_JFFS2_CMDLINE */
-
+#ifndef CONFIG_CMD_MTDPARTS
 /**
  * Check device number to be within valid range for given device type.
  *
  * @param dev device to validate
  * @return 0 if device is valid, 1 otherwise
  */
-static int device_validate(u8 type, u8 num, u32 *size)
+static int mtd_device_validate(u8 type, u8 num, u32 *size)
 {
 	if (type == MTD_DEV_TYPE_NOR) {
 #if defined(CONFIG_CMD_FLASH)
@@ -828,310 +207,6 @@ static int device_validate(u8 type, u8 num, u32 *size)
 	return 1;
 }
 
-#ifdef CONFIG_JFFS2_CMDLINE
-/**
- * Delete all mtd devices from a supplied devices list, free memory allocated for
- * each device and delete all device partitions.
- *
- * @return 0 on success, 1 otherwise
- */
-static int device_delall(struct list_head *head)
-{
-	struct list_head *entry, *n;
-	struct mtd_device *dev_tmp;
-
-	/* clean devices list */
-	list_for_each_safe(entry, n, head) {
-		dev_tmp = list_entry(entry, struct mtd_device, link);
-		list_del(entry);
-		part_delall(&dev_tmp->parts);
-		free(dev_tmp);
-	}
-	INIT_LIST_HEAD(&devices);
-
-	return 0;
-}
-
-/**
- * If provided device exists it's partitions are deleted, device is removed
- * from device list and device memory is freed.
- *
- * @param dev device to be deleted
- * @return 0 on success, 1 otherwise
- */
-static int device_del(struct mtd_device *dev)
-{
-	part_delall(&dev->parts);
-	list_del(&dev->link);
-	free(dev);
-
-	if (dev == current_dev) {
-		/* we just deleted current device */
-		if (list_empty(&devices)) {
-			current_dev = NULL;
-		} else {
-			/* reset first partition from first dev from the
-			 * devices list as current */
-			current_dev = list_entry(devices.next, struct mtd_device, link);
-			current_partnum = 0;
-		}
-		current_save();
-		return 0;
-	}
-
-	index_partitions();
-	return 0;
-}
-
-/**
- * Search global device list and return pointer to the device of type and num
- * specified.
- *
- * @param type device type
- * @param num device number
- * @return NULL if requested device does not exist
- */
-static struct mtd_device* device_find(u8 type, u8 num)
-{
-	struct list_head *entry;
-	struct mtd_device *dev_tmp;
-
-	list_for_each(entry, &devices) {
-		dev_tmp = list_entry(entry, struct mtd_device, link);
-
-		if ((dev_tmp->id->type == type) && (dev_tmp->id->num == num))
-			return dev_tmp;
-	}
-
-	return NULL;
-}
-
-/**
- * Add specified device to the global device list.
- *
- * @param dev device to be added
- */
-static void device_add(struct mtd_device *dev)
-{
-	u8 current_save_needed = 0;
-
-	if (list_empty(&devices)) {
-		current_dev = dev;
-		current_partnum = 0;
-		current_save_needed = 1;
-	}
-
-	list_add_tail(&dev->link, &devices);
-
-	if (current_save_needed > 0)
-		current_save();
-	else
-		index_partitions();
-}
-
-/**
- * Parse device type, name and mtd-id. If syntax is ok allocate memory and
- * return pointer to the device structure.
- *
- * @param mtd_dev pointer to the device definition string i.e. <mtd-dev>
- * @param ret output pointer to next char after parse completes (output)
- * @param retdev pointer to the allocated device (output)
- * @return 0 on success, 1 otherwise
- */
-static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_device **retdev)
-{
-	struct mtd_device *dev;
-	struct part_info *part;
-	struct mtdids *id;
-	const char *mtd_id;
-	unsigned int mtd_id_len;
-	const char *p, *pend;
-	LIST_HEAD(tmp_list);
-	struct list_head *entry, *n;
-	u16 num_parts;
-	u32 offset;
-	int err = 1;
-
-	p = mtd_dev;
-	*retdev = NULL;
-	*ret = NULL;
-
-	DEBUGF("===device_parse===\n");
-
-	/* fetch <mtd-id> */
-	mtd_id = p;
-	if (!(p = strchr(mtd_id, ':'))) {
-		printf("no <mtd-id> identifier\n");
-		return 1;
-	}
-	mtd_id_len = p - mtd_id + 1;
-	p++;
-
-	/* verify if we have a valid device specified */
-	if ((id = id_find_by_mtd_id(mtd_id, mtd_id_len - 1)) == NULL) {
-		printf("invalid mtd device '%.*s'\n", mtd_id_len - 1, mtd_id);
-		return 1;
-	}
-
-	DEBUGF("dev type = %d (%s), dev num = %d, mtd-id = %s\n",
-			id->type, MTD_DEV_TYPE(id->type),
-			id->num, id->mtd_id);
-	pend = strchr(p, ';');
-	DEBUGF("parsing partitions %.*s\n", (pend ? pend - p : strlen(p)), p);
-
-
-	/* parse partitions */
-	num_parts = 0;
-
-	offset = 0;
-	if ((dev = device_find(id->type, id->num)) != NULL) {
-		/* if device already exists start at the end of the last partition */
-		part = list_entry(dev->parts.prev, struct part_info, link);
-		offset = part->offset + part->size;
-	}
-
-	while (p && (*p != '\0') && (*p != ';')) {
-		err = 1;
-		if ((part_parse(p, &p, &part) != 0) || (!part))
-			break;
-
-		/* calculate offset when not specified */
-		if (part->offset == OFFSET_NOT_SPECIFIED)
-			part->offset = offset;
-		else
-			offset = part->offset;
-
-		/* verify alignment and size */
-		if (part_validate(id, part) != 0)
-			break;
-
-		offset += part->size;
-
-		/* partition is ok, add it to the list */
-		list_add_tail(&part->link, &tmp_list);
-		num_parts++;
-		err = 0;
-	}
-	if (err == 1) {
-		part_delall(&tmp_list);
-		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;
-	}
-
-	DEBUGF("\ntotal partitions: %d\n", num_parts);
-
-	/* check for next device presence */
-	if (p) {
-		if (*p == ';') {
-			*ret = ++p;
-		} else if (*p == '\0') {
-			*ret = p;
-		} else {
-			printf("unexpected character '%c' at the end of device\n", *p);
-			*ret = NULL;
-			return 1;
-		}
-	}
-
-	/* allocate memory for mtd_device structure */
-	if ((dev = (struct mtd_device *)malloc(sizeof(struct mtd_device))) == NULL) {
-		printf("out of memory\n");
-		return 1;
-	}
-	memset(dev, 0, sizeof(struct mtd_device));
-	dev->id = id;
-	dev->num_parts = 0; /* part_sort_add increments num_parts */
-	INIT_LIST_HEAD(&dev->parts);
-	INIT_LIST_HEAD(&dev->link);
-
-	/* move partitions from tmp_list to dev->parts */
-	list_for_each_safe(entry, n, &tmp_list) {
-		part = list_entry(entry, struct part_info, link);
-		list_del(entry);
-		if (part_sort_add(dev, part) != 0) {
-			device_del(dev);
-			return 1;
-		}
-	}
-
-	*retdev = dev;
-
-	DEBUGF("===\n\n");
-	return 0;
-}
-
-/**
- * Initialize global device list.
- *
- * @return 0 on success, 1 otherwise
- */
-static int jffs2_devices_init(void)
-{
-	last_parts[0] = '\0';
-	current_dev = NULL;
-	current_save();
-
-	return device_delall(&devices);
-}
-
-/*
- * Search global mtdids list and find id of requested type and number.
- *
- * @return pointer to the id if it exists, NULL otherwise
- */
-static struct mtdids* id_find(u8 type, u8 num)
-{
-	struct list_head *entry;
-	struct mtdids *id;
-
-	list_for_each(entry, &mtdids) {
-		id = list_entry(entry, struct mtdids, link);
-
-		if ((id->type == type) && (id->num == num))
-			return id;
-	}
-
-	return NULL;
-}
-
-/**
- * Search global mtdids list and find id of a requested mtd_id.
- *
- * Note: first argument is not null terminated.
- *
- * @param mtd_id string containing requested mtd_id
- * @param mtd_id_len length of supplied mtd_id
- * @return pointer to the id if it exists, NULL otherwise
- */
-static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_len)
-{
-	struct list_head *entry;
-	struct mtdids *id;
-
-	DEBUGF("--- id_find_by_mtd_id: '%.*s' (len = %d)\n",
-			mtd_id_len, mtd_id, mtd_id_len);
-
-	list_for_each(entry, &mtdids) {
-		id = list_entry(entry, struct mtdids, link);
-
-		DEBUGF("entry: '%s' (len = %d)\n",
-				id->mtd_id, strlen(id->mtd_id));
-
-		if (mtd_id_len != strlen(id->mtd_id))
-			continue;
-		if (strncmp(id->mtd_id, mtd_id, mtd_id_len) == 0)
-			return id;
-	}
-
-	return NULL;
-}
-#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
-
 /**
  * Parse device id string <dev-id> := 'nand'|'nor'|'onenand'<dev-num>,
  * return device type and number.
@@ -1142,7 +217,7 @@ static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_
  * @param dev_num parsed device number (output)
  * @return 0 on success, 1 otherwise
  */
-int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num)
+static int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num)
 {
 	const char *p = id;
 
@@ -1172,606 +247,6 @@ int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num)
 	return 0;
 }
 
-#ifdef CONFIG_JFFS2_CMDLINE
-/**
- * Process all devices and generate corresponding mtdparts string describing
- * all partitions on all devices.
- *
- * @param buf output buffer holding generated mtdparts string (output)
- * @param buflen buffer size
- * @return 0 on success, 1 otherwise
- */
-static int generate_mtdparts(char *buf, u32 buflen)
-{
-	struct list_head *pentry, *dentry;
-	struct mtd_device *dev;
-	struct part_info *part, *prev_part;
-	char *p = buf;
-	char tmpbuf[32];
-	u32 size, offset, len, part_cnt;
-	u32 maxlen = buflen - 1;
-
-	DEBUGF("--- generate_mtdparts ---\n");
-
-	if (list_empty(&devices)) {
-		buf[0] = '\0';
-		return 0;
-	}
-
-	sprintf(p, "mtdparts=");
-	p += 9;
-
-	list_for_each(dentry, &devices) {
-		dev = list_entry(dentry, struct mtd_device, link);
-
-		/* copy mtd_id */
-		len = strlen(dev->id->mtd_id) + 1;
-		if (len > maxlen)
-			goto cleanup;
-		memcpy(p, dev->id->mtd_id, len - 1);
-		p += len - 1;
-		*(p++) = ':';
-		maxlen -= len;
-
-		/* format partitions */
-		prev_part = NULL;
-		part_cnt = 0;
-		list_for_each(pentry, &dev->parts) {
-			part = list_entry(pentry, struct part_info, link);
-			size = part->size;
-			offset = part->offset;
-			part_cnt++;
-
-			/* partition size */
-			memsize_format(tmpbuf, size);
-			len = strlen(tmpbuf);
-			if (len > maxlen)
-				goto cleanup;
-			memcpy(p, tmpbuf, len);
-			p += len;
-			maxlen -= len;
-
-
-			/* add offset only when there is a gap between
-			 * partitions */
-			if ((!prev_part && (offset != 0)) ||
-					(prev_part && ((prev_part->offset + prev_part->size) != part->offset))) {
-
-				memsize_format(tmpbuf, offset);
-				len = strlen(tmpbuf) + 1;
-				if (len > maxlen)
-					goto cleanup;
-				*(p++) = '@';
-				memcpy(p, tmpbuf, len - 1);
-				p += len - 1;
-				maxlen -= len;
-			}
-
-			/* copy name only if user supplied */
-			if(!part->auto_name) {
-				len = strlen(part->name) + 2;
-				if (len > maxlen)
-					goto cleanup;
-
-				*(p++) = '(';
-				memcpy(p, part->name, len - 2);
-				p += len - 2;
-				*(p++) = ')';
-				maxlen -= len;
-			}
-
-			/* ro mask flag */
-			if (part->mask_flags && MTD_WRITEABLE_CMD) {
-				len = 2;
-				if (len > maxlen)
-					goto cleanup;
-				*(p++) = 'r';
-				*(p++) = 'o';
-				maxlen -= 2;
-			}
-
-			/* print ',' separator if there are other partitions
-			 * following */
-			if (dev->num_parts > part_cnt) {
-				if (1 > maxlen)
-					goto cleanup;
-				*(p++) = ',';
-				maxlen--;
-			}
-			prev_part = part;
-		}
-		/* print ';' separator if there are other devices following */
-		if (dentry->next != &devices) {
-			if (1 > maxlen)
-				goto cleanup;
-			*(p++) = ';';
-			maxlen--;
-		}
-	}
-
-	/* we still have at least one char left, as we decremented maxlen at
-	 * the begining */
-	*p = '\0';
-
-	return 0;
-
-cleanup:
-	last_parts[0] = '\0';
-	return 1;
-}
-
-/**
- * Call generate_mtdparts to process all devices and generate corresponding
- * mtdparts string, save it in mtdparts environment variable.
- *
- * @param buf output buffer holding generated mtdparts string (output)
- * @param buflen buffer size
- * @return 0 on success, 1 otherwise
- */
-static int generate_mtdparts_save(char *buf, u32 buflen)
-{
-	int ret;
-
-	ret = generate_mtdparts(buf, buflen);
-
-	if ((buf[0] != '\0') && (ret == 0))
-		setenv("mtdparts", buf);
-	else
-		setenv("mtdparts", NULL);
-
-	return ret;
-}
-
-/**
- * Format and print out a partition list for each device from global device
- * list.
- */
-static void list_partitions(void)
-{
-	struct list_head *dentry, *pentry;
-	struct part_info *part;
-	struct mtd_device *dev;
-	int part_num;
-
-	DEBUGF("\n---list_partitions---\n");
-	list_for_each(dentry, &devices) {
-		dev = list_entry(dentry, struct mtd_device, link);
-		printf("\ndevice %s%d <%s>, # parts = %d\n",
-				MTD_DEV_TYPE(dev->id->type), dev->id->num,
-				dev->id->mtd_id, dev->num_parts);
-		printf(" #: name\t\t\tsize\t\toffset\t\tmask_flags\n");
-
-		/* list partitions for given device */
-		part_num = 0;
-		list_for_each(pentry, &dev->parts) {
-			part = list_entry(pentry, struct part_info, link);
-			printf("%2d: %-20s0x%08x\t0x%08x\t%d\n",
-					part_num, part->name, part->size,
-					part->offset, part->mask_flags);
-
-			part_num++;
-		}
-	}
-	if (list_empty(&devices))
-		printf("no partitions defined\n");
-
-	/* current_dev is not NULL only when we have non empty device list */
-	if (current_dev) {
-		part = jffs2_part_info(current_dev, current_partnum);
-		if (part) {
-			printf("\nactive partition: %s%d,%d - (%s) 0x%08x @ 0x%08x\n",
-					MTD_DEV_TYPE(current_dev->id->type),
-					current_dev->id->num, current_partnum,
-					part->name, part->size, part->offset);
-		} else {
-			printf("could not get current partition info\n\n");
-		}
-	}
-
-	printf("\ndefaults:\n");
-	printf("mtdids  : %s\n", mtdids_default);
-	printf("mtdparts: %s\n", mtdparts_default);
-}
-
-/**
- * Given partition identifier in form of <dev_type><dev_num>,<part_num> find
- * corresponding device and verify partition number.
- *
- * @param id string describing device and partition or partition name
- * @param dev pointer to the requested device (output)
- * @param part_num verified partition number (output)
- * @param part pointer to requested partition (output)
- * @return 0 on success, 1 otherwise
- */
-int find_dev_and_part(const char *id, struct mtd_device **dev,
-		u8 *part_num, struct part_info **part)
-{
-	struct list_head *dentry, *pentry;
-	u8 type, dnum, pnum;
-	const char *p;
-
-	DEBUGF("--- find_dev_and_part ---\nid = %s\n", id);
-
-	list_for_each(dentry, &devices) {
-		*part_num = 0;
-		*dev = list_entry(dentry, struct mtd_device, link);
-		list_for_each(pentry, &(*dev)->parts) {
-			*part = list_entry(pentry, struct part_info, link);
-			if (strcmp((*part)->name, id) == 0)
-				return 0;
-			(*part_num)++;
-		}
-	}
-
-	p = id;
-	*dev = NULL;
-	*part = NULL;
-	*part_num = 0;
-
-	if (id_parse(p, &p, &type, &dnum) != 0)
-		return 1;
-
-	if ((*p++ != ',') || (*p == '\0')) {
-		printf("no partition number specified\n");
-		return 1;
-	}
-	pnum = simple_strtoul(p, (char **)&p, 0);
-	if (*p != '\0') {
-		printf("unexpected trailing character '%c'\n", *p);
-		return 1;
-	}
-
-	if ((*dev = device_find(type, dnum)) == NULL) {
-		printf("no such device %s%d\n", MTD_DEV_TYPE(type), dnum);
-		return 1;
-	}
-
-	if ((*part = jffs2_part_info(*dev, pnum)) == NULL) {
-		printf("no such partition\n");
-		*dev = NULL;
-		return 1;
-	}
-
-	*part_num = pnum;
-
-	return 0;
-}
-
-/**
- * Find and delete partition. For partition id format see find_dev_and_part().
- *
- * @param id string describing device and partition
- * @return 0 on success, 1 otherwise
- */
-static int delete_partition(const char *id)
-{
-	u8 pnum;
-	struct mtd_device *dev;
-	struct part_info *part;
-
-	if (find_dev_and_part(id, &dev, &pnum, &part) == 0) {
-
-		DEBUGF("delete_partition: device = %s%d, partition %d = (%s) 0x%08lx@0x%08lx\n",
-				MTD_DEV_TYPE(dev->id->type), dev->id->num, pnum,
-				part->name, part->size, part->offset);
-
-		if (part_del(dev, part) != 0)
-			return 1;
-
-		if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) {
-			printf("generated mtdparts too long, reseting to null\n");
-			return 1;
-		}
-		return 0;
-	}
-
-	printf("partition %s not found\n", id);
-	return 1;
-}
-
-/**
- * Accept character string describing mtd partitions and call device_parse()
- * for each entry. Add created devices to the global devices list.
- *
- * @param mtdparts string specifing mtd partitions
- * @return 0 on success, 1 otherwise
- */
-static int parse_mtdparts(const char *const mtdparts)
-{
-	const char *p = mtdparts;
-	struct mtd_device *dev;
-	int err = 1;
-
-	DEBUGF("\n---parse_mtdparts---\nmtdparts = %s\n\n", p);
-
-	/* delete all devices and partitions */
-	if (jffs2_devices_init() != 0) {
-		printf("could not initialise device list\n");
-		return err;
-	}
-
-	/* re-read 'mtdparts' variable, jffs2_devices_init may be updating env */
-	p = getenv("mtdparts");
-
-	if (strncmp(p, "mtdparts=", 9) != 0) {
-		printf("mtdparts variable doesn't start with 'mtdparts='\n");
-		return err;
-	}
-	p += 9;
-
-	while (p && (*p != '\0')) {
-		err = 1;
-		if ((device_parse(p, &p, &dev) != 0) || (!dev))
-			break;
-
-		DEBUGF("+ device: %s\t%d\t%s\n", MTD_DEV_TYPE(dev->id->type),
-				dev->id->num, dev->id->mtd_id);
-
-		/* check if parsed device is already on the list */
-		if (device_find(dev->id->type, dev->id->num) != NULL) {
-			printf("device %s%d redefined, please correct mtdparts variable\n",
-					MTD_DEV_TYPE(dev->id->type), dev->id->num);
-			break;
-		}
-
-		list_add_tail(&dev->link, &devices);
-		err = 0;
-	}
-	if (err == 1) {
-		device_delall(&devices);
-		return 1;
-	}
-
-	return 0;
-}
-
-/**
- * Parse provided string describing mtdids mapping (see file header for mtdids
- * variable format). Allocate memory for each entry and add all found entries
- * to the global mtdids list.
- *
- * @param ids mapping string
- * @return 0 on success, 1 otherwise
- */
-static int parse_mtdids(const char *const ids)
-{
-	const char *p = ids;
-	const char *mtd_id;
-	int mtd_id_len;
-	struct mtdids *id;
-	struct list_head *entry, *n;
-	struct mtdids *id_tmp;
-	u8 type, num;
-	u32 size;
-	int ret = 1;
-
-	DEBUGF("\n---parse_mtdids---\nmtdids = %s\n\n", ids);
-
-	/* clean global mtdids list */
-	list_for_each_safe(entry, n, &mtdids) {
-		id_tmp = list_entry(entry, struct mtdids, link);
-		DEBUGF("mtdids del: %d %d\n", id_tmp->type, id_tmp->num);
-		list_del(entry);
-		free(id_tmp);
-	}
-	last_ids[0] = '\0';
-	INIT_LIST_HEAD(&mtdids);
-
-	while(p && (*p != '\0')) {
-
-		ret = 1;
-		/* parse 'nor'|'nand'|'onenand'<dev-num> */
-		if (id_parse(p, &p, &type, &num) != 0)
-			break;
-
-		if (*p != '=') {
-			printf("mtdids: incorrect <dev-num>\n");
-			break;
-		}
-		p++;
-
-		/* check if requested device exists */
-		if (device_validate(type, num, &size) != 0)
-			return 1;
-
-		/* locate <mtd-id> */
-		mtd_id = p;
-		if ((p = strchr(mtd_id, ',')) != NULL) {
-			mtd_id_len = p - mtd_id + 1;
-			p++;
-		} else {
-			mtd_id_len = strlen(mtd_id) + 1;
-		}
-		if (mtd_id_len == 0) {
-			printf("mtdids: no <mtd-id> identifier\n");
-			break;
-		}
-
-		/* check if this id is already on the list */
-		int double_entry = 0;
-		list_for_each(entry, &mtdids) {
-			id_tmp = list_entry(entry, struct mtdids, link);
-			if ((id_tmp->type == type) && (id_tmp->num == num)) {
-				double_entry = 1;
-				break;
-			}
-		}
-		if (double_entry) {
-			printf("device id %s%d redefined, please correct mtdids variable\n",
-					MTD_DEV_TYPE(type), num);
-			break;
-		}
-
-		/* allocate mtdids structure */
-		if (!(id = (struct mtdids *)malloc(sizeof(struct mtdids) + mtd_id_len))) {
-			printf("out of memory\n");
-			break;
-		}
-		memset(id, 0, sizeof(struct mtdids) + mtd_id_len);
-		id->num = num;
-		id->type = type;
-		id->size = size;
-		id->mtd_id = (char *)(id + 1);
-		strncpy(id->mtd_id, mtd_id, mtd_id_len - 1);
-		id->mtd_id[mtd_id_len - 1] = '\0';
-		INIT_LIST_HEAD(&id->link);
-
-		DEBUGF("+ id %s%d\t%16d bytes\t%s\n",
-				MTD_DEV_TYPE(id->type), id->num,
-				id->size, id->mtd_id);
-
-		list_add_tail(&id->link, &mtdids);
-		ret = 0;
-	}
-	if (ret == 1) {
-		/* clean mtdids list and free allocated memory */
-		list_for_each_safe(entry, n, &mtdids) {
-			id_tmp = list_entry(entry, struct mtdids, link);
-			list_del(entry);
-			free(id_tmp);
-		}
-		return 1;
-	}
-
-	return 0;
-}
-
-/**
- * Parse and initialize global mtdids mapping and create global
- * device/partition list.
- *
- * @return 0 on success, 1 otherwise
- */
-int mtdparts_init(void)
-{
-	static int initialized = 0;
-	const char *ids, *parts;
-	const char *current_partition;
-	int ids_changed;
-	char tmp_ep[PARTITION_MAXLEN];
-
-	DEBUGF("\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);
-		initialized = 1;
-	}
-
-	/* get variables */
-	ids = getenv("mtdids");
-	parts = getenv("mtdparts");
-	current_partition = getenv("partition");
-
-	/* save it for later parsing, cannot rely on current partition pointer
-	 * as 'partition' variable may be updated during init */
-	tmp_ep[0] = '\0';
-	if (current_partition)
-		strncpy(tmp_ep, current_partition, PARTITION_MAXLEN);
-
-	DEBUGF("last_ids  : %s\n", last_ids);
-	DEBUGF("env_ids   : %s\n", ids);
-	DEBUGF("last_parts: %s\n", last_parts);
-	DEBUGF("env_parts : %s\n\n", parts);
-
-	DEBUGF("last_partition : %s\n", last_partition);
-	DEBUGF("env_partition  : %s\n", current_partition);
-
-	/* if mtdids varible is empty try to use defaults */
-	if (!ids) {
-		if (mtdids_default) {
-			DEBUGF("mtdids variable not defined, using default\n");
-			ids = mtdids_default;
-			setenv("mtdids", (char *)ids);
-		} else {
-			printf("mtdids not defined, no default present\n");
-			return 1;
-		}
-	}
-	if (strlen(ids) > MTDIDS_MAXLEN - 1) {
-		printf("mtdids too long (> %d)\n", MTDIDS_MAXLEN);
-		return 1;
-	}
-
-	/* do no try to use defaults when mtdparts variable is not defined,
-	 * just check the length */
-	if (!parts)
-		printf("mtdparts variable not set, see 'help mtdparts'\n");
-
-	if (parts && (strlen(parts) > MTDPARTS_MAXLEN - 1)) {
-		printf("mtdparts too long (> %d)\n", MTDPARTS_MAXLEN);
-		return 1;
-	}
-
-	/* check if we have already parsed those mtdids */
-	if ((last_ids[0] != '\0') && (strcmp(last_ids, ids) == 0)) {
-		ids_changed = 0;
-	} else {
-		ids_changed = 1;
-
-		if (parse_mtdids(ids) != 0) {
-			jffs2_devices_init();
-			return 1;
-		}
-
-		/* ok it's good, save new ids */
-		strncpy(last_ids, ids, MTDIDS_MAXLEN);
-	}
-
-	/* parse partitions if either mtdparts or mtdids were updated */
-	if (parts && ((last_parts[0] == '\0') || ((strcmp(last_parts, parts) != 0)) || ids_changed)) {
-		if (parse_mtdparts(parts) != 0)
-			return 1;
-
-		if (list_empty(&devices)) {
-			printf("mtdparts_init: no valid partitions\n");
-			return 1;
-		}
-
-		/* ok it's good, save new parts */
-		strncpy(last_parts, parts, MTDPARTS_MAXLEN);
-
-		/* reset first partition from first dev from the list as current */
-		current_dev = list_entry(devices.next, struct mtd_device, link);
-		current_partnum = 0;
-		current_save();
-
-		DEBUGF("mtdparts_init: current_dev  = %s%d, current_partnum = %d\n",
-				MTD_DEV_TYPE(current_dev->id->type),
-				current_dev->id->num, current_partnum);
-	}
-
-	/* mtdparts variable was reset to NULL, delete all devices/partitions */
-	if (!parts && (last_parts[0] != '\0'))
-		return jffs2_devices_init();
-
-	/* do not process current partition if mtdparts variable is null */
-	if (!parts)
-		return 0;
-
-	/* is current partition set in environment? if so, use it */
-	if ((tmp_ep[0] != '\0') && (strcmp(tmp_ep, last_partition) != 0)) {
-		struct part_info *p;
-		struct mtd_device *cdev;
-		u8 pnum;
-
-		DEBUGF("--- getting current partition: %s\n", tmp_ep);
-
-		if (find_dev_and_part(tmp_ep, &cdev, &pnum, &p) == 0) {
-			current_dev = cdev;
-			current_partnum = pnum;
-			current_save();
-		}
-	} else if (getenv("partition") == NULL) {
-		DEBUGF("no partition variable set, setting...\n");
-		current_save();
-	}
-
-	return 0;
-}
-#else /* #ifdef CONFIG_JFFS2_CMDLINE */
 /*
  * 'Static' version of command line mtdparts_init() routine. Single partition on
  * a single device configuration.
@@ -1908,8 +383,8 @@ int mtdparts_init(void)
 		dev_name = "nor0";
 #endif
 
-		if ((id_parse(dev_name, NULL, &id->type, &id->num) != 0) ||
-				(device_validate(id->type, id->num, &size) != 0)) {
+		if ((mtd_id_parse(dev_name, NULL, &id->type, &id->num) != 0) ||
+				(mtd_device_validate(id->type, id->num, &size) != 0)) {
 			printf("incorrect device: %s%d\n", MTD_DEV_TYPE(id->type), id->num);
 			free(current_dev);
 			return 1;
@@ -1958,7 +433,7 @@ int mtdparts_init(void)
 
 	return 0;
 }
-#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
+#endif /* #ifndef CONFIG_CMD_MTDPARTS */
 
 /**
  * Return pointer to the partition of a requested number from a requested
@@ -2145,155 +620,6 @@ int do_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 1;
 }
 
-/* command line only */
-#ifdef CONFIG_JFFS2_CMDLINE
-/**
- * Routine implementing u-boot chpart command. Sets new current partition based
- * on the user supplied partition id. For partition id format see find_dev_and_part().
- *
- * @param cmdtp command internal data
- * @param flag command flag
- * @param argc number of arguments supplied to the command
- * @param argv arguments list
- * @return 0 on success, 1 otherwise
- */
-int do_jffs2_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
-/* command line only */
-	struct mtd_device *dev;
-	struct part_info *part;
-	u8 pnum;
-
-	if (mtdparts_init() !=0)
-		return 1;
-
-	if (argc < 2) {
-		printf("no partition id specified\n");
-		return 1;
-	}
-
-	if (find_dev_and_part(argv[1], &dev, &pnum, &part) != 0)
-		return 1;
-
-	current_dev = dev;
-	current_partnum = pnum;
-	current_save();
-
-	printf("partition changed to %s%d,%d\n",
-			MTD_DEV_TYPE(dev->id->type), dev->id->num, pnum);
-
-	return 0;
-}
-
-/**
- * Routine implementing u-boot mtdparts command. Initialize/update default global
- * partition list and process user partition request (list, add, del).
- *
- * @param cmdtp command internal data
- * @param flag command flag
- * @param argc number of arguments supplied to the command
- * @param argv arguments list
- * @return 0 on success, 1 otherwise
- */
-int do_jffs2_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
-	if (argc == 2) {
-		if (strcmp(argv[1], "default") == 0) {
-			setenv("mtdids", (char *)mtdids_default);
-			setenv("mtdparts", (char *)mtdparts_default);
-			setenv("partition", NULL);
-
-			mtdparts_init();
-			return 0;
-		} else if (strcmp(argv[1], "delall") == 0) {
-			/* this may be the first run, initialize lists if needed */
-			mtdparts_init();
-
-			setenv("mtdparts", NULL);
-
-			/* jffs2_devices_init() calls current_save() */
-			return jffs2_devices_init();
-		}
-	}
-
-	/* make sure we are in sync with env variables */
-	if (mtdparts_init() != 0)
-		return 1;
-
-	if (argc == 1) {
-		list_partitions();
-		return 0;
-	}
-
-	/* mtdparts add <mtd-dev> <size>[@<offset>] <name> [ro] */
-	if (((argc == 5) || (argc == 6)) && (strcmp(argv[1], "add") == 0)) {
-#define PART_ADD_DESC_MAXLEN 64
-		char tmpbuf[PART_ADD_DESC_MAXLEN];
-		u8 type, num, len;
-		struct mtd_device *dev;
-		struct mtd_device *dev_tmp;
-		struct mtdids *id;
-		struct part_info *p;
-
-		if (id_parse(argv[2], NULL, &type, &num) != 0)
-			return 1;
-
-		if ((id = id_find(type, num)) == NULL) {
-			printf("no such device %s defined in mtdids variable\n", argv[2]);
-			return 1;
-		}
-
-		len = strlen(id->mtd_id) + 1;	/* 'mtd_id:' */
-		len += strlen(argv[3]);		/* size@offset */
-		len += strlen(argv[4]) + 2;	/* '(' name ')' */
-		if (argv[5] && (strlen(argv[5]) == 2))
-			len += 2;		/* 'ro' */
-
-		if (len >= PART_ADD_DESC_MAXLEN) {
-			printf("too long partition description\n");
-			return 1;
-		}
-		sprintf(tmpbuf, "%s:%s(%s)%s",
-				id->mtd_id, argv[3], argv[4], argv[5] ? argv[5] : "");
-		DEBUGF("add tmpbuf: %s\n", tmpbuf);
-
-		if ((device_parse(tmpbuf, NULL, &dev) != 0) || (!dev))
-			return 1;
-
-		DEBUGF("+ %s\t%d\t%s\n", MTD_DEV_TYPE(dev->id->type),
-				dev->id->num, dev->id->mtd_id);
-
-		if ((dev_tmp = device_find(dev->id->type, dev->id->num)) == NULL) {
-			device_add(dev);
-		} else {
-			/* merge new partition with existing ones*/
-			p = list_entry(dev->parts.next, struct part_info, link);
-			if (part_add(dev_tmp, p) != 0) {
-				device_del(dev);
-				return 1;
-			}
-		}
-
-		if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) {
-			printf("generated mtdparts too long, reseting to null\n");
-			return 1;
-		}
-
-		return 0;
-	}
-
-	/* mtdparts del part-id */
-	if ((argc == 3) && (strcmp(argv[1], "del") == 0)) {
-		DEBUGF("del: part-id = %s\n", argv[2]);
-
-		return delete_partition(argv[2]);
-	}
-
-	cmd_usage(cmdtp);
-	return 1;
-}
-#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
-
 /***************************************************/
 U_BOOT_CMD(
 	fsload,	3,	0,	do_jffs2_fsload,
@@ -2314,49 +640,4 @@ U_BOOT_CMD(
 	"print information about filesystems",
 	"    - print information about filesystems\n"
 );
-
-#ifdef CONFIG_JFFS2_CMDLINE
-U_BOOT_CMD(
-	chpart,	2,	0,	do_jffs2_chpart,
-	"change active partition",
-	"part-id\n"
-	"    - change active partition (e.g. part-id = nand0,1)\n"
-);
-
-U_BOOT_CMD(
-	mtdparts,	6,	0,	do_jffs2_mtdparts,
-	"define flash/nand partitions",
-	"\n"
-	"    - list partition table\n"
-	"mtdparts delall\n"
-	"    - delete all partitions\n"
-	"mtdparts del part-id\n"
-	"    - delete partition (e.g. part-id = nand0,1)\n"
-	"mtdparts add <mtd-dev> <size>[@<offset>] [<name>] [ro]\n"
-	"    - add partition\n"
-	"mtdparts default\n"
-	"    - reset partition table to defaults\n\n"
-	"-----\n\n"
-	"this command uses three environment variables:\n\n"
-	"'partition' - keeps current partition identifier\n\n"
-	"partition  := <part-id>\n"
-	"<part-id>  := <dev-id>,part_num\n\n"
-	"'mtdids' - linux kernel mtd device id <-> u-boot device id mapping\n\n"
-	"mtdids=<idmap>[,<idmap>,...]\n\n"
-	"<idmap>    := <dev-id>=<mtd-id>\n"
-	"<dev-id>   := 'nand'|'nor'|'onenand'<dev-num>\n"
-	"<dev-num>  := mtd device number, 0...\n"
-	"<mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)\n\n"
-	"'mtdparts' - partition list\n\n"
-	"mtdparts=mtdparts=<mtd-def>[;<mtd-def>...]\n\n"
-	"<mtd-def>  := <mtd-id>:<part-def>[,<part-def>...]\n"
-	"<mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)\n"
-	"<part-def> := <size>[@<offset>][<name>][<ro-flag>]\n"
-	"<size>     := standard linux memsize OR '-' to denote all remaining space\n"
-	"<offset>   := partition start offset within the device\n"
-	"<name>     := '(' NAME ')'\n"
-	"<ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)\n"
-);
-#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
-
 /***************************************************/
diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c
new file mode 100644
index 0000000000..c8bf2c6392
--- /dev/null
+++ b/common/cmd_mtdparts.c
@@ -0,0 +1,1986 @@
+/*
+ * (C) Copyright 2002
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * (C) Copyright 2002
+ * Robert Schwebel, Pengutronix, <r.schwebel@pengutronix.de>
+ *
+ * (C) Copyright 2003
+ * Kai-Uwe Bloem, Auerswald GmbH & Co KG, <linux-development@auerswald.de>
+ *
+ * (C) Copyright 2005
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ *   Added support for reading flash partition table from environment.
+ *   Parsing routines are based on driver/mtd/cmdline.c from the linux 2.4
+ *   kernel tree.
+ *
+ *   $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
+ *   Copyright 2002 SYSGO Real-Time Solutions GmbH
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * Three environment variables are used by the parsing routines:
+ *
+ * 'partition' - keeps current partition identifier
+ *
+ * partition  := <part-id>
+ * <part-id>  := <dev-id>,part_num
+ *
+ *
+ * 'mtdids' - linux kernel mtd device id <-> u-boot device id mapping
+ *
+ * mtdids=<idmap>[,<idmap>,...]
+ *
+ * <idmap>    := <dev-id>=<mtd-id>
+ * <dev-id>   := 'nand'|'nor'|'onenand'<dev-num>
+ * <dev-num>  := mtd device number, 0...
+ * <mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)
+ *
+ *
+ * 'mtdparts' - partition list
+ *
+ * mtdparts=mtdparts=<mtd-def>[;<mtd-def>...]
+ *
+ * <mtd-def>  := <mtd-id>:<part-def>[,<part-def>...]
+ * <mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)
+ * <part-def> := <size>[@<offset>][<name>][<ro-flag>]
+ * <size>     := standard linux memsize OR '-' to denote all remaining space
+ * <offset>   := partition start offset within the device
+ * <name>     := '(' NAME ')'
+ * <ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)
+ *
+ * Notes:
+ * - each <mtd-id> used in mtdparts must albo exist in 'mtddis' mapping
+ * - if the above variables are not set defaults for a given target are used
+ *
+ * Examples:
+ *
+ * 1 NOR Flash, with 1 single writable partition:
+ * mtdids=nor0=edb7312-nor
+ * mtdparts=mtdparts=edb7312-nor:-
+ *
+ * 1 NOR Flash with 2 partitions, 1 NAND with one
+ * mtdids=nor0=edb7312-nor,nand0=edb7312-nand
+ * mtdparts=mtdparts=edb7312-nor:256k(ARMboot)ro,-(root);edb7312-nand:-(home)
+ *
+ */
+
+/*
+ * JFFS2/CRAMFS support
+ */
+#include <common.h>
+#include <command.h>
+#include <malloc.h>
+#include <jffs2/jffs2.h>
+#include <linux/list.h>
+#include <linux/ctype.h>
+#include <cramfs/cramfs_fs.h>
+
+#if defined(CONFIG_CMD_NAND)
+#ifdef CONFIG_NAND_LEGACY
+#include <linux/mtd/nand_legacy.h>
+#else /* !CONFIG_NAND_LEGACY */
+#include <linux/mtd/nand.h>
+#include <nand.h>
+#endif /* !CONFIG_NAND_LEGACY */
+#endif
+
+#if defined(CONFIG_CMD_ONENAND)
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/onenand.h>
+#include <onenand_uboot.h>
+#endif
+
+/* enable/disable debugging messages */
+#define	DEBUG_MTDPARTS
+#undef	DEBUG_MTDPARTS
+
+#ifdef  DEBUG_MTDPARTS
+# define DEBUGF(fmt, args...)	printf(fmt ,##args)
+#else
+# define DEBUGF(fmt, args...)
+#endif
+
+/* special size referring to all the remaining space in a partition */
+#define SIZE_REMAINING		0xFFFFFFFF
+
+/* special offset value, it is used when not provided by user
+ *
+ * this value is used temporarily during parsing, later such offests
+ * are recalculated */
+#define OFFSET_NOT_SPECIFIED	0xFFFFFFFF
+
+/* minimum partition size */
+#define MIN_PART_SIZE		4096
+
+/* this flag needs to be set in part_info struct mask_flags
+ * field for read-only partitions */
+#define MTD_WRITEABLE_CMD		1
+
+/* default values for mtdids and mtdparts variables */
+#if defined(MTDIDS_DEFAULT)
+static const char *const mtdids_default = MTDIDS_DEFAULT;
+#else
+#warning "MTDIDS_DEFAULT not defined!"
+static const char *const mtdids_default = NULL;
+#endif
+
+#if defined(MTDPARTS_DEFAULT)
+static const char *const mtdparts_default = MTDPARTS_DEFAULT;
+#else
+#warning "MTDPARTS_DEFAULT not defined!"
+static const char *const mtdparts_default = NULL;
+#endif
+
+/* copies of last seen 'mtdids', 'mtdparts' and 'partition' env variables */
+#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];
+
+/* low level jffs2 cache cleaning routine */
+extern void jffs2_free_cache(struct part_info *part);
+
+/* mtdids mapping list, filled by parse_ids() */
+struct list_head mtdids;
+
+/* device/partition list, parse_cmdline() parses into here */
+struct list_head devices;
+
+/* current active device and partition number */
+static struct mtd_device *current_dev = NULL;
+static u8 current_partnum = 0;
+
+static struct part_info* mtd_part_info(struct mtd_device *dev, unsigned int part_num);
+
+/* command line only routines */
+static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_len);
+static int device_del(struct mtd_device *dev);
+
+/**
+ * Parses a string into a number.  The number stored at ptr is
+ * potentially suffixed with K (for kilobytes, or 1024 bytes),
+ * M (for megabytes, or 1048576 bytes), or G (for gigabytes, or
+ * 1073741824).  If the number is suffixed with K, M, or G, then
+ * the return value is the number multiplied by one kilobyte, one
+ * megabyte, or one gigabyte, respectively.
+ *
+ * @param ptr where parse begins
+ * @param retptr output pointer to next char after parse completes (output)
+ * @return resulting unsigned int
+ */
+static unsigned long memsize_parse (const char *const ptr, const char **retptr)
+{
+	unsigned long ret = simple_strtoul(ptr, (char **)retptr, 0);
+
+	switch (**retptr) {
+		case 'G':
+		case 'g':
+			ret <<= 10;
+		case 'M':
+		case 'm':
+			ret <<= 10;
+		case 'K':
+		case 'k':
+			ret <<= 10;
+			(*retptr)++;
+		default:
+			break;
+	}
+
+	return ret;
+}
+
+/**
+ * Format string describing supplied size. This routine does the opposite job
+ * to memsize_parse(). Size in bytes is converted to string and if possible
+ * shortened by using k (kilobytes), m (megabytes) or g (gigabytes) suffix.
+ *
+ * Note, that this routine does not check for buffer overflow, it's the caller
+ * who must assure enough space.
+ *
+ * @param buf output buffer
+ * @param size size to be converted to string
+ */
+static void memsize_format(char *buf, u32 size)
+{
+#define SIZE_GB ((u32)1024*1024*1024)
+#define SIZE_MB ((u32)1024*1024)
+#define SIZE_KB ((u32)1024)
+
+	if ((size % SIZE_GB) == 0)
+		sprintf(buf, "%ug", size/SIZE_GB);
+	else if ((size % SIZE_MB) == 0)
+		sprintf(buf, "%um", size/SIZE_MB);
+	else if (size % SIZE_KB == 0)
+		sprintf(buf, "%uk", size/SIZE_KB);
+	else
+		sprintf(buf, "%u", size);
+}
+
+/**
+ * This routine does global indexing of all partitions. Resulting index for
+ * current partition is saved in 'mtddevnum'. Current partition name in
+ * 'mtddevname'.
+ */
+static void index_partitions(void)
+{
+	char buf[16];
+	u16 mtddevnum;
+	struct part_info *part;
+	struct list_head *dentry;
+	struct mtd_device *dev;
+
+	DEBUGF("--- index partitions ---\n");
+
+	if (current_dev) {
+		mtddevnum = 0;
+		list_for_each(dentry, &devices) {
+			dev = list_entry(dentry, struct mtd_device, link);
+			if (dev == current_dev) {
+				mtddevnum += current_partnum;
+				sprintf(buf, "%d", mtddevnum);
+				setenv("mtddevnum", buf);
+				break;
+			}
+			mtddevnum += dev->num_parts;
+		}
+
+		part = mtd_part_info(current_dev, current_partnum);
+		setenv("mtddevname", part->name);
+
+		DEBUGF("=> mtddevnum %d,\n=> mtddevname %s\n", mtddevnum, part->name);
+	} else {
+		setenv("mtddevnum", NULL);
+		setenv("mtddevname", NULL);
+
+		DEBUGF("=> mtddevnum NULL\n=> mtddevname NULL\n");
+	}
+}
+
+/**
+ * Save current device and partition in environment variable 'partition'.
+ */
+static void current_save(void)
+{
+	char buf[16];
+
+	DEBUGF("--- current_save ---\n");
+
+	if (current_dev) {
+		sprintf(buf, "%s%d,%d", MTD_DEV_TYPE(current_dev->id->type),
+					current_dev->id->num, current_partnum);
+
+		setenv("partition", buf);
+		strncpy(last_partition, buf, 16);
+
+		DEBUGF("=> partition %s\n", buf);
+	} else {
+		setenv("partition", NULL);
+		last_partition[0] = '\0';
+
+		DEBUGF("=> partition NULL\n");
+	}
+	index_partitions();
+}
+
+/**
+ * Performs sanity check for supplied NOR flash partition. Table of existing
+ * NOR flash devices is searched and partition device is located. Alignment
+ * with the granularity of NOR flash sectors is verified.
+ *
+ * @param id of the parent device
+ * @param part partition to validate
+ * @return 0 if partition is valid, 1 otherwise
+ */
+static int part_validate_nor(struct mtdids *id, struct part_info *part)
+{
+#if defined(CONFIG_CMD_FLASH)
+	/* info for FLASH chips */
+	extern flash_info_t flash_info[];
+	flash_info_t *flash;
+	int offset_aligned;
+	u32 end_offset, sector_size = 0;
+	int i;
+
+	flash = &flash_info[id->num];
+
+	/* size of last sector */
+	part->sector_size = flash->size -
+		(flash->start[flash->sector_count-1] - flash->start[0]);
+
+	offset_aligned = 0;
+	for (i = 0; i < flash->sector_count; i++) {
+		if ((flash->start[i] - flash->start[0]) == part->offset) {
+			offset_aligned = 1;
+			break;
+		}
+	}
+	if (offset_aligned == 0) {
+		printf("%s%d: partition (%s) start offset alignment incorrect\n",
+				MTD_DEV_TYPE(id->type), id->num, part->name);
+		return 1;
+	}
+
+	end_offset = part->offset + part->size;
+	offset_aligned = 0;
+	for (i = 0; i < flash->sector_count; i++) {
+		if (i) {
+			sector_size = flash->start[i] - flash->start[i-1];
+			if (part->sector_size < sector_size)
+				part->sector_size = sector_size;
+		}
+		if ((flash->start[i] - flash->start[0]) == end_offset)
+			offset_aligned = 1;
+	}
+
+	if (offset_aligned || flash->size == end_offset)
+		return 0;
+
+	printf("%s%d: partition (%s) size alignment incorrect\n",
+			MTD_DEV_TYPE(id->type), id->num, part->name);
+#endif
+	return 1;
+}
+
+/**
+ * Performs sanity check for supplied NAND flash partition. Table of existing
+ * NAND flash devices is searched and partition device is located. Alignment
+ * with the granularity of nand erasesize is verified.
+ *
+ * @param id of the parent device
+ * @param part partition to validate
+ * @return 0 if partition is valid, 1 otherwise
+ */
+static int part_validate_nand(struct mtdids *id, struct part_info *part)
+{
+#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
+	/* info for NAND chips */
+	nand_info_t *nand;
+
+	nand = &nand_info[id->num];
+
+	part->sector_size = nand->erasesize;
+
+	if ((unsigned long)(part->offset) % nand->erasesize) {
+		printf("%s%d: partition (%s) start offset alignment incorrect\n",
+				MTD_DEV_TYPE(id->type), id->num, part->name);
+		return 1;
+	}
+
+	if (part->size % nand->erasesize) {
+		printf("%s%d: partition (%s) size alignment incorrect\n",
+				MTD_DEV_TYPE(id->type), id->num, part->name);
+		return 1;
+	}
+
+	return 0;
+#else
+	return 1;
+#endif
+}
+
+/**
+ * Performs sanity check for supplied OneNAND flash partition.
+ * Table of existing OneNAND flash devices is searched and partition device
+ * is located. Alignment with the granularity of nand erasesize is verified.
+ *
+ * @param id of the parent device
+ * @param part partition to validate
+ * @return 0 if partition is valid, 1 otherwise
+ */
+static int part_validate_onenand(struct mtdids *id, struct part_info *part)
+{
+#if defined(CONFIG_CMD_ONENAND)
+	/* info for OneNAND chips */
+	struct mtd_info *mtd;
+
+	mtd = &onenand_mtd;
+
+	part->sector_size = mtd->erasesize;
+
+	if ((unsigned long)(part->offset) % mtd->erasesize) {
+		printf("%s%d: partition (%s) start offset"
+			"alignment incorrect\n",
+				MTD_DEV_TYPE(id->type), id->num, part->name);
+		return 1;
+	}
+
+	if (part->size % mtd->erasesize) {
+		printf("%s%d: partition (%s) size alignment incorrect\n",
+				MTD_DEV_TYPE(id->type), id->num, part->name);
+		return 1;
+	}
+
+	return 0;
+#else
+	return 1;
+#endif
+}
+
+
+/**
+ * Performs sanity check for supplied partition. Offset and size are verified
+ * to be within valid range. Partition type is checked and either
+ * parts_validate_nor() or parts_validate_nand() is called with the argument
+ * of part.
+ *
+ * @param id of the parent device
+ * @param part partition to validate
+ * @return 0 if partition is valid, 1 otherwise
+ */
+static int part_validate(struct mtdids *id, struct part_info *part)
+{
+	if (part->size == SIZE_REMAINING)
+		part->size = id->size - part->offset;
+
+	if (part->offset > id->size) {
+		printf("%s: offset %08x beyond flash size %08x\n",
+				id->mtd_id, part->offset, id->size);
+		return 1;
+	}
+
+	if ((part->offset + part->size) <= part->offset) {
+		printf("%s%d: partition (%s) size too big\n",
+				MTD_DEV_TYPE(id->type), id->num, part->name);
+		return 1;
+	}
+
+	if (part->offset + part->size > id->size) {
+		printf("%s: partitioning exceeds flash size\n", id->mtd_id);
+		return 1;
+	}
+
+	if (id->type == MTD_DEV_TYPE_NAND)
+		return part_validate_nand(id, part);
+	else if (id->type == MTD_DEV_TYPE_NOR)
+		return part_validate_nor(id, part);
+	else if (id->type == MTD_DEV_TYPE_ONENAND)
+		return part_validate_onenand(id, part);
+	else
+		DEBUGF("part_validate: invalid dev type\n");
+
+	return 1;
+}
+
+/**
+ * Delete selected partition from the partion list of the specified device.
+ *
+ * @param dev device to delete partition from
+ * @param part partition to delete
+ * @return 0 on success, 1 otherwise
+ */
+static int part_del(struct mtd_device *dev, struct part_info *part)
+{
+	u8 current_save_needed = 0;
+
+	/* if there is only one partition, remove whole device */
+	if (dev->num_parts == 1)
+		return device_del(dev);
+
+	/* otherwise just delete this partition */
+
+	if (dev == current_dev) {
+		/* we are modyfing partitions for the current device,
+		 * update current */
+		struct part_info *curr_pi;
+		curr_pi = mtd_part_info(current_dev, current_partnum);
+
+		if (curr_pi) {
+			if (curr_pi == part) {
+				printf("current partition deleted, resetting current to 0\n");
+				current_partnum = 0;
+			} else if (part->offset <= curr_pi->offset) {
+				current_partnum--;
+			}
+			current_save_needed = 1;
+		}
+	}
+
+#ifdef CONFIG_NAND_LEGACY
+	jffs2_free_cache(part);
+#endif
+	list_del(&part->link);
+	free(part);
+	dev->num_parts--;
+
+	if (current_save_needed > 0)
+		current_save();
+	else
+		index_partitions();
+
+	return 0;
+}
+
+/**
+ * Delete all partitions from parts head list, free memory.
+ *
+ * @param head list of partitions to delete
+ */
+static void part_delall(struct list_head *head)
+{
+	struct list_head *entry, *n;
+	struct part_info *part_tmp;
+
+	/* clean tmp_list and free allocated memory */
+	list_for_each_safe(entry, n, head) {
+		part_tmp = list_entry(entry, struct part_info, link);
+
+#ifdef CONFIG_NAND_LEGACY
+		jffs2_free_cache(part_tmp);
+#endif
+		list_del(entry);
+		free(part_tmp);
+	}
+}
+
+/**
+ * Add new partition to the supplied partition list. Make sure partitions are
+ * sorted by offset in ascending order.
+ *
+ * @param head list this partition is to be added to
+ * @param new partition to be added
+ */
+static int part_sort_add(struct mtd_device *dev, struct part_info *part)
+{
+	struct list_head *entry;
+	struct part_info *new_pi, *curr_pi;
+
+	/* link partition to parrent dev */
+	part->dev = dev;
+
+	if (list_empty(&dev->parts)) {
+		DEBUGF("part_sort_add: list empty\n");
+		list_add(&part->link, &dev->parts);
+		dev->num_parts++;
+		index_partitions();
+		return 0;
+	}
+
+	new_pi = list_entry(&part->link, struct part_info, link);
+
+	/* get current partition info if we are updating current device */
+	curr_pi = NULL;
+	if (dev == current_dev)
+		curr_pi = mtd_part_info(current_dev, current_partnum);
+
+	list_for_each(entry, &dev->parts) {
+		struct part_info *pi;
+
+		pi = list_entry(entry, struct part_info, link);
+
+		/* be compliant with kernel cmdline, allow only one partition at offset zero */
+		if ((new_pi->offset == pi->offset) && (pi->offset == 0)) {
+			printf("cannot add second partition at offset 0\n");
+			return 1;
+		}
+
+		if (new_pi->offset <= pi->offset) {
+			list_add_tail(&part->link, entry);
+			dev->num_parts++;
+
+			if (curr_pi && (pi->offset <= curr_pi->offset)) {
+				/* we are modyfing partitions for the current
+				 * device, update current */
+				current_partnum++;
+				current_save();
+			} else {
+				index_partitions();
+			}
+			return 0;
+		}
+	}
+
+	list_add_tail(&part->link, &dev->parts);
+	dev->num_parts++;
+	index_partitions();
+	return 0;
+}
+
+/**
+ * Add provided partition to the partition list of a given device.
+ *
+ * @param dev device to which partition is added
+ * @param part partition to be added
+ * @return 0 on success, 1 otherwise
+ */
+static int part_add(struct mtd_device *dev, struct part_info *part)
+{
+	/* verify alignment and size */
+	if (part_validate(dev->id, part) != 0)
+		return 1;
+
+	/* partition is ok, add it to the list */
+	if (part_sort_add(dev, part) != 0)
+		return 1;
+
+	return 0;
+}
+
+/**
+ * Parse one partition definition, allocate memory and return pointer to this
+ * location in retpart.
+ *
+ * @param partdef pointer to the partition definition string i.e. <part-def>
+ * @param ret output pointer to next char after parse completes (output)
+ * @param retpart pointer to the allocated partition (output)
+ * @return 0 on success, 1 otherwise
+ */
+static int part_parse(const char *const partdef, const char **ret, struct part_info **retpart)
+{
+	struct part_info *part;
+	unsigned long size;
+	unsigned long offset;
+	const char *name;
+	int name_len;
+	unsigned int mask_flags;
+	const char *p;
+
+	p = partdef;
+	*retpart = NULL;
+	*ret = NULL;
+
+	/* fetch the partition size */
+	if (*p == '-') {
+		/* assign all remaining space to this partition */
+		DEBUGF("'-': remaining size assigned\n");
+		size = SIZE_REMAINING;
+		p++;
+	} else {
+		size = memsize_parse(p, &p);
+		if (size < MIN_PART_SIZE) {
+			printf("partition size too small (%lx)\n", size);
+			return 1;
+		}
+	}
+
+	/* check for offset */
+	offset = OFFSET_NOT_SPECIFIED;
+	if (*p == '@') {
+		p++;
+		offset = memsize_parse(p, &p);
+	}
+
+	/* now look for the name */
+	if (*p == '(') {
+		name = ++p;
+		if ((p = strchr(name, ')')) == NULL) {
+			printf("no closing ) found in partition name\n");
+			return 1;
+		}
+		name_len = p - name + 1;
+		if ((name_len - 1) == 0) {
+			printf("empty partition name\n");
+			return 1;
+		}
+		p++;
+	} else {
+		/* 0x00000000@0x00000000 */
+		name_len = 22;
+		name = NULL;
+	}
+
+	/* test for options */
+	mask_flags = 0;
+	if (strncmp(p, "ro", 2) == 0) {
+		mask_flags |= MTD_WRITEABLE_CMD;
+		p += 2;
+	}
+
+	/* check for next partition definition */
+	if (*p == ',') {
+		if (size == SIZE_REMAINING) {
+			*ret = NULL;
+			printf("no partitions allowed after a fill-up partition\n");
+			return 1;
+		}
+		*ret = ++p;
+	} else if ((*p == ';') || (*p == '\0')) {
+		*ret = p;
+	} else {
+		printf("unexpected character '%c' at the end of partition\n", *p);
+		*ret = NULL;
+		return 1;
+	}
+
+	/*  allocate memory */
+	part = (struct part_info *)malloc(sizeof(struct part_info) + name_len);
+	if (!part) {
+		printf("out of memory\n");
+		return 1;
+	}
+	memset(part, 0, sizeof(struct part_info) + name_len);
+	part->size = size;
+	part->offset = offset;
+	part->mask_flags = mask_flags;
+	part->name = (char *)(part + 1);
+
+	if (name) {
+		/* copy user provided name */
+		strncpy(part->name, name, name_len - 1);
+		part->auto_name = 0;
+	} else {
+		/* auto generated name in form of size@offset */
+		sprintf(part->name, "0x%08lx@0x%08lx", size, offset);
+		part->auto_name = 1;
+	}
+
+	part->name[name_len - 1] = '\0';
+	INIT_LIST_HEAD(&part->link);
+
+	DEBUGF("+ partition: name %-22s size 0x%08x offset 0x%08x mask flags %d\n",
+			part->name, part->size,
+			part->offset, part->mask_flags);
+
+	*retpart = part;
+	return 0;
+}
+
+/**
+ * Check device number to be within valid range for given device type.
+ *
+ * @param dev device to validate
+ * @return 0 if device is valid, 1 otherwise
+ */
+int mtd_device_validate(u8 type, u8 num, u32 *size)
+{
+	if (type == MTD_DEV_TYPE_NOR) {
+#if defined(CONFIG_CMD_FLASH)
+		if (num < CONFIG_SYS_MAX_FLASH_BANKS) {
+			extern flash_info_t flash_info[];
+			*size = flash_info[num].size;
+
+			return 0;
+		}
+
+		printf("no such FLASH device: %s%d (valid range 0 ... %d\n",
+				MTD_DEV_TYPE(type), num, CONFIG_SYS_MAX_FLASH_BANKS - 1);
+#else
+		printf("support for FLASH devices not present\n");
+#endif
+	} else if (type == MTD_DEV_TYPE_NAND) {
+#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
+		if (num < CONFIG_SYS_MAX_NAND_DEVICE) {
+#ifndef CONFIG_NAND_LEGACY
+			*size = nand_info[num].size;
+#else
+			extern struct nand_chip nand_dev_desc[CONFIG_SYS_MAX_NAND_DEVICE];
+			*size = nand_dev_desc[num].totlen;
+#endif
+			return 0;
+		}
+
+		printf("no such NAND device: %s%d (valid range 0 ... %d)\n",
+				MTD_DEV_TYPE(type), num, CONFIG_SYS_MAX_NAND_DEVICE - 1);
+#else
+		printf("support for NAND devices not present\n");
+#endif
+	} else if (type == MTD_DEV_TYPE_ONENAND) {
+#if defined(CONFIG_CMD_ONENAND)
+		*size = onenand_mtd.size;
+		return 0;
+#else
+		printf("support for OneNAND devices not present\n");
+#endif
+	} else
+		printf("Unknown defice type %d\n", type);
+
+	return 1;
+}
+
+/**
+ * Delete all mtd devices from a supplied devices list, free memory allocated for
+ * each device and delete all device partitions.
+ *
+ * @return 0 on success, 1 otherwise
+ */
+static int device_delall(struct list_head *head)
+{
+	struct list_head *entry, *n;
+	struct mtd_device *dev_tmp;
+
+	/* clean devices list */
+	list_for_each_safe(entry, n, head) {
+		dev_tmp = list_entry(entry, struct mtd_device, link);
+		list_del(entry);
+		part_delall(&dev_tmp->parts);
+		free(dev_tmp);
+	}
+	INIT_LIST_HEAD(&devices);
+
+	return 0;
+}
+
+/**
+ * If provided device exists it's partitions are deleted, device is removed
+ * from device list and device memory is freed.
+ *
+ * @param dev device to be deleted
+ * @return 0 on success, 1 otherwise
+ */
+static int device_del(struct mtd_device *dev)
+{
+	part_delall(&dev->parts);
+	list_del(&dev->link);
+	free(dev);
+
+	if (dev == current_dev) {
+		/* we just deleted current device */
+		if (list_empty(&devices)) {
+			current_dev = NULL;
+		} else {
+			/* reset first partition from first dev from the
+			 * devices list as current */
+			current_dev = list_entry(devices.next, struct mtd_device, link);
+			current_partnum = 0;
+		}
+		current_save();
+		return 0;
+	}
+
+	index_partitions();
+	return 0;
+}
+
+/**
+ * Search global device list and return pointer to the device of type and num
+ * specified.
+ *
+ * @param type device type
+ * @param num device number
+ * @return NULL if requested device does not exist
+ */
+static struct mtd_device* device_find(u8 type, u8 num)
+{
+	struct list_head *entry;
+	struct mtd_device *dev_tmp;
+
+	list_for_each(entry, &devices) {
+		dev_tmp = list_entry(entry, struct mtd_device, link);
+
+		if ((dev_tmp->id->type == type) && (dev_tmp->id->num == num))
+			return dev_tmp;
+	}
+
+	return NULL;
+}
+
+/**
+ * Add specified device to the global device list.
+ *
+ * @param dev device to be added
+ */
+static void device_add(struct mtd_device *dev)
+{
+	u8 current_save_needed = 0;
+
+	if (list_empty(&devices)) {
+		current_dev = dev;
+		current_partnum = 0;
+		current_save_needed = 1;
+	}
+
+	list_add_tail(&dev->link, &devices);
+
+	if (current_save_needed > 0)
+		current_save();
+	else
+		index_partitions();
+}
+
+/**
+ * Parse device type, name and mtd-id. If syntax is ok allocate memory and
+ * return pointer to the device structure.
+ *
+ * @param mtd_dev pointer to the device definition string i.e. <mtd-dev>
+ * @param ret output pointer to next char after parse completes (output)
+ * @param retdev pointer to the allocated device (output)
+ * @return 0 on success, 1 otherwise
+ */
+static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_device **retdev)
+{
+	struct mtd_device *dev;
+	struct part_info *part;
+	struct mtdids *id;
+	const char *mtd_id;
+	unsigned int mtd_id_len;
+	const char *p, *pend;
+	LIST_HEAD(tmp_list);
+	struct list_head *entry, *n;
+	u16 num_parts;
+	u32 offset;
+	int err = 1;
+
+	p = mtd_dev;
+	*retdev = NULL;
+	*ret = NULL;
+
+	DEBUGF("===device_parse===\n");
+
+	/* fetch <mtd-id> */
+	mtd_id = p;
+	if (!(p = strchr(mtd_id, ':'))) {
+		printf("no <mtd-id> identifier\n");
+		return 1;
+	}
+	mtd_id_len = p - mtd_id + 1;
+	p++;
+
+	/* verify if we have a valid device specified */
+	if ((id = id_find_by_mtd_id(mtd_id, mtd_id_len - 1)) == NULL) {
+		printf("invalid mtd device '%.*s'\n", mtd_id_len - 1, mtd_id);
+		return 1;
+	}
+
+	DEBUGF("dev type = %d (%s), dev num = %d, mtd-id = %s\n",
+			id->type, MTD_DEV_TYPE(id->type),
+			id->num, id->mtd_id);
+	pend = strchr(p, ';');
+	DEBUGF("parsing partitions %.*s\n", (pend ? pend - p : strlen(p)), p);
+
+
+	/* parse partitions */
+	num_parts = 0;
+
+	offset = 0;
+	if ((dev = device_find(id->type, id->num)) != NULL) {
+		/* if device already exists start at the end of the last partition */
+		part = list_entry(dev->parts.prev, struct part_info, link);
+		offset = part->offset + part->size;
+	}
+
+	while (p && (*p != '\0') && (*p != ';')) {
+		err = 1;
+		if ((part_parse(p, &p, &part) != 0) || (!part))
+			break;
+
+		/* calculate offset when not specified */
+		if (part->offset == OFFSET_NOT_SPECIFIED)
+			part->offset = offset;
+		else
+			offset = part->offset;
+
+		/* verify alignment and size */
+		if (part_validate(id, part) != 0)
+			break;
+
+		offset += part->size;
+
+		/* partition is ok, add it to the list */
+		list_add_tail(&part->link, &tmp_list);
+		num_parts++;
+		err = 0;
+	}
+	if (err == 1) {
+		part_delall(&tmp_list);
+		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;
+	}
+
+	DEBUGF("\ntotal partitions: %d\n", num_parts);
+
+	/* check for next device presence */
+	if (p) {
+		if (*p == ';') {
+			*ret = ++p;
+		} else if (*p == '\0') {
+			*ret = p;
+		} else {
+			printf("unexpected character '%c' at the end of device\n", *p);
+			*ret = NULL;
+			return 1;
+		}
+	}
+
+	/* allocate memory for mtd_device structure */
+	if ((dev = (struct mtd_device *)malloc(sizeof(struct mtd_device))) == NULL) {
+		printf("out of memory\n");
+		return 1;
+	}
+	memset(dev, 0, sizeof(struct mtd_device));
+	dev->id = id;
+	dev->num_parts = 0; /* part_sort_add increments num_parts */
+	INIT_LIST_HEAD(&dev->parts);
+	INIT_LIST_HEAD(&dev->link);
+
+	/* move partitions from tmp_list to dev->parts */
+	list_for_each_safe(entry, n, &tmp_list) {
+		part = list_entry(entry, struct part_info, link);
+		list_del(entry);
+		if (part_sort_add(dev, part) != 0) {
+			device_del(dev);
+			return 1;
+		}
+	}
+
+	*retdev = dev;
+
+	DEBUGF("===\n\n");
+	return 0;
+}
+
+/**
+ * Initialize global device list.
+ *
+ * @return 0 on success, 1 otherwise
+ */
+static int mtd_devices_init(void)
+{
+	last_parts[0] = '\0';
+	current_dev = NULL;
+	current_save();
+
+	return device_delall(&devices);
+}
+
+/*
+ * Search global mtdids list and find id of requested type and number.
+ *
+ * @return pointer to the id if it exists, NULL otherwise
+ */
+static struct mtdids* id_find(u8 type, u8 num)
+{
+	struct list_head *entry;
+	struct mtdids *id;
+
+	list_for_each(entry, &mtdids) {
+		id = list_entry(entry, struct mtdids, link);
+
+		if ((id->type == type) && (id->num == num))
+			return id;
+	}
+
+	return NULL;
+}
+
+/**
+ * Search global mtdids list and find id of a requested mtd_id.
+ *
+ * Note: first argument is not null terminated.
+ *
+ * @param mtd_id string containing requested mtd_id
+ * @param mtd_id_len length of supplied mtd_id
+ * @return pointer to the id if it exists, NULL otherwise
+ */
+static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_len)
+{
+	struct list_head *entry;
+	struct mtdids *id;
+
+	DEBUGF("--- id_find_by_mtd_id: '%.*s' (len = %d)\n",
+			mtd_id_len, mtd_id, mtd_id_len);
+
+	list_for_each(entry, &mtdids) {
+		id = list_entry(entry, struct mtdids, link);
+
+		DEBUGF("entry: '%s' (len = %d)\n",
+				id->mtd_id, strlen(id->mtd_id));
+
+		if (mtd_id_len != strlen(id->mtd_id))
+			continue;
+		if (strncmp(id->mtd_id, mtd_id, mtd_id_len) == 0)
+			return id;
+	}
+
+	return NULL;
+}
+
+/**
+ * Parse device id string <dev-id> := 'nand'|'nor'|'onenand'<dev-num>,
+ * return device type and number.
+ *
+ * @param id string describing device id
+ * @param ret_id output pointer to next char after parse completes (output)
+ * @param dev_type parsed device type (output)
+ * @param dev_num parsed device number (output)
+ * @return 0 on success, 1 otherwise
+ */
+int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num)
+{
+	const char *p = id;
+
+	*dev_type = 0;
+	if (strncmp(p, "nand", 4) == 0) {
+		*dev_type = MTD_DEV_TYPE_NAND;
+		p += 4;
+	} else if (strncmp(p, "nor", 3) == 0) {
+		*dev_type = MTD_DEV_TYPE_NOR;
+		p += 3;
+	} else if (strncmp(p, "onenand", 7) == 0) {
+		*dev_type = MTD_DEV_TYPE_ONENAND;
+		p += 7;
+	} else {
+		printf("incorrect device type in %s\n", id);
+		return 1;
+	}
+
+	if (!isdigit(*p)) {
+		printf("incorrect device number in %s\n", id);
+		return 1;
+	}
+
+	*dev_num = simple_strtoul(p, (char **)&p, 0);
+	if (ret_id)
+		*ret_id = p;
+	return 0;
+}
+
+/**
+ * Process all devices and generate corresponding mtdparts string describing
+ * all partitions on all devices.
+ *
+ * @param buf output buffer holding generated mtdparts string (output)
+ * @param buflen buffer size
+ * @return 0 on success, 1 otherwise
+ */
+static int generate_mtdparts(char *buf, u32 buflen)
+{
+	struct list_head *pentry, *dentry;
+	struct mtd_device *dev;
+	struct part_info *part, *prev_part;
+	char *p = buf;
+	char tmpbuf[32];
+	u32 size, offset, len, part_cnt;
+	u32 maxlen = buflen - 1;
+
+	DEBUGF("--- generate_mtdparts ---\n");
+
+	if (list_empty(&devices)) {
+		buf[0] = '\0';
+		return 0;
+	}
+
+	sprintf(p, "mtdparts=");
+	p += 9;
+
+	list_for_each(dentry, &devices) {
+		dev = list_entry(dentry, struct mtd_device, link);
+
+		/* copy mtd_id */
+		len = strlen(dev->id->mtd_id) + 1;
+		if (len > maxlen)
+			goto cleanup;
+		memcpy(p, dev->id->mtd_id, len - 1);
+		p += len - 1;
+		*(p++) = ':';
+		maxlen -= len;
+
+		/* format partitions */
+		prev_part = NULL;
+		part_cnt = 0;
+		list_for_each(pentry, &dev->parts) {
+			part = list_entry(pentry, struct part_info, link);
+			size = part->size;
+			offset = part->offset;
+			part_cnt++;
+
+			/* partition size */
+			memsize_format(tmpbuf, size);
+			len = strlen(tmpbuf);
+			if (len > maxlen)
+				goto cleanup;
+			memcpy(p, tmpbuf, len);
+			p += len;
+			maxlen -= len;
+
+
+			/* add offset only when there is a gap between
+			 * partitions */
+			if ((!prev_part && (offset != 0)) ||
+					(prev_part && ((prev_part->offset + prev_part->size) != part->offset))) {
+
+				memsize_format(tmpbuf, offset);
+				len = strlen(tmpbuf) + 1;
+				if (len > maxlen)
+					goto cleanup;
+				*(p++) = '@';
+				memcpy(p, tmpbuf, len - 1);
+				p += len - 1;
+				maxlen -= len;
+			}
+
+			/* copy name only if user supplied */
+			if(!part->auto_name) {
+				len = strlen(part->name) + 2;
+				if (len > maxlen)
+					goto cleanup;
+
+				*(p++) = '(';
+				memcpy(p, part->name, len - 2);
+				p += len - 2;
+				*(p++) = ')';
+				maxlen -= len;
+			}
+
+			/* ro mask flag */
+			if (part->mask_flags && MTD_WRITEABLE_CMD) {
+				len = 2;
+				if (len > maxlen)
+					goto cleanup;
+				*(p++) = 'r';
+				*(p++) = 'o';
+				maxlen -= 2;
+			}
+
+			/* print ',' separator if there are other partitions
+			 * following */
+			if (dev->num_parts > part_cnt) {
+				if (1 > maxlen)
+					goto cleanup;
+				*(p++) = ',';
+				maxlen--;
+			}
+			prev_part = part;
+		}
+		/* print ';' separator if there are other devices following */
+		if (dentry->next != &devices) {
+			if (1 > maxlen)
+				goto cleanup;
+			*(p++) = ';';
+			maxlen--;
+		}
+	}
+
+	/* we still have at least one char left, as we decremented maxlen at
+	 * the begining */
+	*p = '\0';
+
+	return 0;
+
+cleanup:
+	last_parts[0] = '\0';
+	return 1;
+}
+
+/**
+ * Call generate_mtdparts to process all devices and generate corresponding
+ * mtdparts string, save it in mtdparts environment variable.
+ *
+ * @param buf output buffer holding generated mtdparts string (output)
+ * @param buflen buffer size
+ * @return 0 on success, 1 otherwise
+ */
+static int generate_mtdparts_save(char *buf, u32 buflen)
+{
+	int ret;
+
+	ret = generate_mtdparts(buf, buflen);
+
+	if ((buf[0] != '\0') && (ret == 0))
+		setenv("mtdparts", buf);
+	else
+		setenv("mtdparts", NULL);
+
+	return ret;
+}
+
+/**
+ * Format and print out a partition list for each device from global device
+ * list.
+ */
+static void list_partitions(void)
+{
+	struct list_head *dentry, *pentry;
+	struct part_info *part;
+	struct mtd_device *dev;
+	int part_num;
+
+	DEBUGF("\n---list_partitions---\n");
+	list_for_each(dentry, &devices) {
+		dev = list_entry(dentry, struct mtd_device, link);
+		printf("\ndevice %s%d <%s>, # parts = %d\n",
+				MTD_DEV_TYPE(dev->id->type), dev->id->num,
+				dev->id->mtd_id, dev->num_parts);
+		printf(" #: name\t\t\tsize\t\toffset\t\tmask_flags\n");
+
+		/* list partitions for given device */
+		part_num = 0;
+		list_for_each(pentry, &dev->parts) {
+			part = list_entry(pentry, struct part_info, link);
+			printf("%2d: %-20s0x%08x\t0x%08x\t%d\n",
+					part_num, part->name, part->size,
+					part->offset, part->mask_flags);
+
+			part_num++;
+		}
+	}
+	if (list_empty(&devices))
+		printf("no partitions defined\n");
+
+	/* current_dev is not NULL only when we have non empty device list */
+	if (current_dev) {
+		part = mtd_part_info(current_dev, current_partnum);
+		if (part) {
+			printf("\nactive partition: %s%d,%d - (%s) 0x%08x @ 0x%08x\n",
+					MTD_DEV_TYPE(current_dev->id->type),
+					current_dev->id->num, current_partnum,
+					part->name, part->size, part->offset);
+		} else {
+			printf("could not get current partition info\n\n");
+		}
+	}
+
+	printf("\ndefaults:\n");
+	printf("mtdids  : %s\n", mtdids_default);
+	printf("mtdparts: %s\n", mtdparts_default);
+}
+
+/**
+ * Given partition identifier in form of <dev_type><dev_num>,<part_num> find
+ * corresponding device and verify partition number.
+ *
+ * @param id string describing device and partition or partition name
+ * @param dev pointer to the requested device (output)
+ * @param part_num verified partition number (output)
+ * @param part pointer to requested partition (output)
+ * @return 0 on success, 1 otherwise
+ */
+int find_dev_and_part(const char *id, struct mtd_device **dev,
+		u8 *part_num, struct part_info **part)
+{
+	struct list_head *dentry, *pentry;
+	u8 type, dnum, pnum;
+	const char *p;
+
+	DEBUGF("--- find_dev_and_part ---\nid = %s\n", id);
+
+	list_for_each(dentry, &devices) {
+		*part_num = 0;
+		*dev = list_entry(dentry, struct mtd_device, link);
+		list_for_each(pentry, &(*dev)->parts) {
+			*part = list_entry(pentry, struct part_info, link);
+			if (strcmp((*part)->name, id) == 0)
+				return 0;
+			(*part_num)++;
+		}
+	}
+
+	p = id;
+	*dev = NULL;
+	*part = NULL;
+	*part_num = 0;
+
+	if (mtd_id_parse(p, &p, &type, &dnum) != 0)
+		return 1;
+
+	if ((*p++ != ',') || (*p == '\0')) {
+		printf("no partition number specified\n");
+		return 1;
+	}
+	pnum = simple_strtoul(p, (char **)&p, 0);
+	if (*p != '\0') {
+		printf("unexpected trailing character '%c'\n", *p);
+		return 1;
+	}
+
+	if ((*dev = device_find(type, dnum)) == NULL) {
+		printf("no such device %s%d\n", MTD_DEV_TYPE(type), dnum);
+		return 1;
+	}
+
+	if ((*part = mtd_part_info(*dev, pnum)) == NULL) {
+		printf("no such partition\n");
+		*dev = NULL;
+		return 1;
+	}
+
+	*part_num = pnum;
+
+	return 0;
+}
+
+/**
+ * Find and delete partition. For partition id format see find_dev_and_part().
+ *
+ * @param id string describing device and partition
+ * @return 0 on success, 1 otherwise
+ */
+static int delete_partition(const char *id)
+{
+	u8 pnum;
+	struct mtd_device *dev;
+	struct part_info *part;
+
+	if (find_dev_and_part(id, &dev, &pnum, &part) == 0) {
+
+		DEBUGF("delete_partition: device = %s%d, partition %d = (%s) 0x%08lx@0x%08lx\n",
+				MTD_DEV_TYPE(dev->id->type), dev->id->num, pnum,
+				part->name, part->size, part->offset);
+
+		if (part_del(dev, part) != 0)
+			return 1;
+
+		if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) {
+			printf("generated mtdparts too long, reseting to null\n");
+			return 1;
+		}
+		return 0;
+	}
+
+	printf("partition %s not found\n", id);
+	return 1;
+}
+
+/**
+ * Accept character string describing mtd partitions and call device_parse()
+ * for each entry. Add created devices to the global devices list.
+ *
+ * @param mtdparts string specifing mtd partitions
+ * @return 0 on success, 1 otherwise
+ */
+static int parse_mtdparts(const char *const mtdparts)
+{
+	const char *p = mtdparts;
+	struct mtd_device *dev;
+	int err = 1;
+
+	DEBUGF("\n---parse_mtdparts---\nmtdparts = %s\n\n", p);
+
+	/* delete all devices and partitions */
+	if (mtd_devices_init() != 0) {
+		printf("could not initialise device list\n");
+		return err;
+	}
+
+	/* re-read 'mtdparts' variable, mtd_devices_init may be updating env */
+	p = getenv("mtdparts");
+
+	if (strncmp(p, "mtdparts=", 9) != 0) {
+		printf("mtdparts variable doesn't start with 'mtdparts='\n");
+		return err;
+	}
+	p += 9;
+
+	while (p && (*p != '\0')) {
+		err = 1;
+		if ((device_parse(p, &p, &dev) != 0) || (!dev))
+			break;
+
+		DEBUGF("+ device: %s\t%d\t%s\n", MTD_DEV_TYPE(dev->id->type),
+				dev->id->num, dev->id->mtd_id);
+
+		/* check if parsed device is already on the list */
+		if (device_find(dev->id->type, dev->id->num) != NULL) {
+			printf("device %s%d redefined, please correct mtdparts variable\n",
+					MTD_DEV_TYPE(dev->id->type), dev->id->num);
+			break;
+		}
+
+		list_add_tail(&dev->link, &devices);
+		err = 0;
+	}
+	if (err == 1) {
+		device_delall(&devices);
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * Parse provided string describing mtdids mapping (see file header for mtdids
+ * variable format). Allocate memory for each entry and add all found entries
+ * to the global mtdids list.
+ *
+ * @param ids mapping string
+ * @return 0 on success, 1 otherwise
+ */
+static int parse_mtdids(const char *const ids)
+{
+	const char *p = ids;
+	const char *mtd_id;
+	int mtd_id_len;
+	struct mtdids *id;
+	struct list_head *entry, *n;
+	struct mtdids *id_tmp;
+	u8 type, num;
+	u32 size;
+	int ret = 1;
+
+	DEBUGF("\n---parse_mtdids---\nmtdids = %s\n\n", ids);
+
+	/* clean global mtdids list */
+	list_for_each_safe(entry, n, &mtdids) {
+		id_tmp = list_entry(entry, struct mtdids, link);
+		DEBUGF("mtdids del: %d %d\n", id_tmp->type, id_tmp->num);
+		list_del(entry);
+		free(id_tmp);
+	}
+	last_ids[0] = '\0';
+	INIT_LIST_HEAD(&mtdids);
+
+	while(p && (*p != '\0')) {
+
+		ret = 1;
+		/* parse 'nor'|'nand'|'onenand'<dev-num> */
+		if (mtd_id_parse(p, &p, &type, &num) != 0)
+			break;
+
+		if (*p != '=') {
+			printf("mtdids: incorrect <dev-num>\n");
+			break;
+		}
+		p++;
+
+		/* check if requested device exists */
+		if (mtd_device_validate(type, num, &size) != 0)
+			return 1;
+
+		/* locate <mtd-id> */
+		mtd_id = p;
+		if ((p = strchr(mtd_id, ',')) != NULL) {
+			mtd_id_len = p - mtd_id + 1;
+			p++;
+		} else {
+			mtd_id_len = strlen(mtd_id) + 1;
+		}
+		if (mtd_id_len == 0) {
+			printf("mtdids: no <mtd-id> identifier\n");
+			break;
+		}
+
+		/* check if this id is already on the list */
+		int double_entry = 0;
+		list_for_each(entry, &mtdids) {
+			id_tmp = list_entry(entry, struct mtdids, link);
+			if ((id_tmp->type == type) && (id_tmp->num == num)) {
+				double_entry = 1;
+				break;
+			}
+		}
+		if (double_entry) {
+			printf("device id %s%d redefined, please correct mtdids variable\n",
+					MTD_DEV_TYPE(type), num);
+			break;
+		}
+
+		/* allocate mtdids structure */
+		if (!(id = (struct mtdids *)malloc(sizeof(struct mtdids) + mtd_id_len))) {
+			printf("out of memory\n");
+			break;
+		}
+		memset(id, 0, sizeof(struct mtdids) + mtd_id_len);
+		id->num = num;
+		id->type = type;
+		id->size = size;
+		id->mtd_id = (char *)(id + 1);
+		strncpy(id->mtd_id, mtd_id, mtd_id_len - 1);
+		id->mtd_id[mtd_id_len - 1] = '\0';
+		INIT_LIST_HEAD(&id->link);
+
+		DEBUGF("+ id %s%d\t%16d bytes\t%s\n",
+				MTD_DEV_TYPE(id->type), id->num,
+				id->size, id->mtd_id);
+
+		list_add_tail(&id->link, &mtdids);
+		ret = 0;
+	}
+	if (ret == 1) {
+		/* clean mtdids list and free allocated memory */
+		list_for_each_safe(entry, n, &mtdids) {
+			id_tmp = list_entry(entry, struct mtdids, link);
+			list_del(entry);
+			free(id_tmp);
+		}
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * Parse and initialize global mtdids mapping and create global
+ * device/partition list.
+ *
+ * @return 0 on success, 1 otherwise
+ */
+int mtdparts_init(void)
+{
+	static int initialized = 0;
+	const char *ids, *parts;
+	const char *current_partition;
+	int ids_changed;
+	char tmp_ep[PARTITION_MAXLEN];
+
+	DEBUGF("\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);
+		initialized = 1;
+	}
+
+	/* get variables */
+	ids = getenv("mtdids");
+	parts = getenv("mtdparts");
+	current_partition = getenv("partition");
+
+	/* save it for later parsing, cannot rely on current partition pointer
+	 * as 'partition' variable may be updated during init */
+	tmp_ep[0] = '\0';
+	if (current_partition)
+		strncpy(tmp_ep, current_partition, PARTITION_MAXLEN);
+
+	DEBUGF("last_ids  : %s\n", last_ids);
+	DEBUGF("env_ids   : %s\n", ids);
+	DEBUGF("last_parts: %s\n", last_parts);
+	DEBUGF("env_parts : %s\n\n", parts);
+
+	DEBUGF("last_partition : %s\n", last_partition);
+	DEBUGF("env_partition  : %s\n", current_partition);
+
+	/* if mtdids varible is empty try to use defaults */
+	if (!ids) {
+		if (mtdids_default) {
+			DEBUGF("mtdids variable not defined, using default\n");
+			ids = mtdids_default;
+			setenv("mtdids", (char *)ids);
+		} else {
+			printf("mtdids not defined, no default present\n");
+			return 1;
+		}
+	}
+	if (strlen(ids) > MTDIDS_MAXLEN - 1) {
+		printf("mtdids too long (> %d)\n", MTDIDS_MAXLEN);
+		return 1;
+	}
+
+	/* do no try to use defaults when mtdparts variable is not defined,
+	 * just check the length */
+	if (!parts)
+		printf("mtdparts variable not set, see 'help mtdparts'\n");
+
+	if (parts && (strlen(parts) > MTDPARTS_MAXLEN - 1)) {
+		printf("mtdparts too long (> %d)\n", MTDPARTS_MAXLEN);
+		return 1;
+	}
+
+	/* check if we have already parsed those mtdids */
+	if ((last_ids[0] != '\0') && (strcmp(last_ids, ids) == 0)) {
+		ids_changed = 0;
+	} else {
+		ids_changed = 1;
+
+		if (parse_mtdids(ids) != 0) {
+			mtd_devices_init();
+			return 1;
+		}
+
+		/* ok it's good, save new ids */
+		strncpy(last_ids, ids, MTDIDS_MAXLEN);
+	}
+
+	/* parse partitions if either mtdparts or mtdids were updated */
+	if (parts && ((last_parts[0] == '\0') || ((strcmp(last_parts, parts) != 0)) || ids_changed)) {
+		if (parse_mtdparts(parts) != 0)
+			return 1;
+
+		if (list_empty(&devices)) {
+			printf("mtdparts_init: no valid partitions\n");
+			return 1;
+		}
+
+		/* ok it's good, save new parts */
+		strncpy(last_parts, parts, MTDPARTS_MAXLEN);
+
+		/* reset first partition from first dev from the list as current */
+		current_dev = list_entry(devices.next, struct mtd_device, link);
+		current_partnum = 0;
+		current_save();
+
+		DEBUGF("mtdparts_init: current_dev  = %s%d, current_partnum = %d\n",
+				MTD_DEV_TYPE(current_dev->id->type),
+				current_dev->id->num, current_partnum);
+	}
+
+	/* mtdparts variable was reset to NULL, delete all devices/partitions */
+	if (!parts && (last_parts[0] != '\0'))
+		return mtd_devices_init();
+
+	/* do not process current partition if mtdparts variable is null */
+	if (!parts)
+		return 0;
+
+	/* is current partition set in environment? if so, use it */
+	if ((tmp_ep[0] != '\0') && (strcmp(tmp_ep, last_partition) != 0)) {
+		struct part_info *p;
+		struct mtd_device *cdev;
+		u8 pnum;
+
+		DEBUGF("--- getting current partition: %s\n", tmp_ep);
+
+		if (find_dev_and_part(tmp_ep, &cdev, &pnum, &p) == 0) {
+			current_dev = cdev;
+			current_partnum = pnum;
+			current_save();
+		}
+	} else if (getenv("partition") == NULL) {
+		DEBUGF("no partition variable set, setting...\n");
+		current_save();
+	}
+
+	return 0;
+}
+
+/**
+ * Return pointer to the partition of a requested number from a requested
+ * device.
+ *
+ * @param dev device that is to be searched for a partition
+ * @param part_num requested partition number
+ * @return pointer to the part_info, NULL otherwise
+ */
+static struct part_info* mtd_part_info(struct mtd_device *dev, unsigned int part_num)
+{
+	struct list_head *entry;
+	struct part_info *part;
+	int num;
+
+	if (!dev)
+		return NULL;
+
+	DEBUGF("\n--- mtd_part_info: partition number %d for device %s%d (%s)\n",
+			part_num, MTD_DEV_TYPE(dev->id->type),
+			dev->id->num, dev->id->mtd_id);
+
+	if (part_num >= dev->num_parts) {
+		printf("invalid partition number %d for device %s%d (%s)\n",
+				part_num, MTD_DEV_TYPE(dev->id->type),
+				dev->id->num, dev->id->mtd_id);
+		return NULL;
+	}
+
+	/* locate partition number, return it */
+	num = 0;
+	list_for_each(entry, &dev->parts) {
+		part = list_entry(entry, struct part_info, link);
+
+		if (part_num == num++) {
+			return part;
+		}
+	}
+
+	return NULL;
+}
+
+/***************************************************/
+/* U-boot commands				   */
+/***************************************************/
+/* command line only */
+/**
+ * Routine implementing u-boot chpart command. Sets new current partition based
+ * on the user supplied partition id. For partition id format see find_dev_and_part().
+ *
+ * @param cmdtp command internal data
+ * @param flag command flag
+ * @param argc number of arguments supplied to the command
+ * @param argv arguments list
+ * @return 0 on success, 1 otherwise
+ */
+int do_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+/* command line only */
+	struct mtd_device *dev;
+	struct part_info *part;
+	u8 pnum;
+
+	if (mtdparts_init() !=0)
+		return 1;
+
+	if (argc < 2) {
+		printf("no partition id specified\n");
+		return 1;
+	}
+
+	if (find_dev_and_part(argv[1], &dev, &pnum, &part) != 0)
+		return 1;
+
+	current_dev = dev;
+	current_partnum = pnum;
+	current_save();
+
+	printf("partition changed to %s%d,%d\n",
+			MTD_DEV_TYPE(dev->id->type), dev->id->num, pnum);
+
+	return 0;
+}
+
+/**
+ * Routine implementing u-boot mtdparts command. Initialize/update default global
+ * partition list and process user partition request (list, add, del).
+ *
+ * @param cmdtp command internal data
+ * @param flag command flag
+ * @param argc number of arguments supplied to the command
+ * @param argv arguments list
+ * @return 0 on success, 1 otherwise
+ */
+int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	if (argc == 2) {
+		if (strcmp(argv[1], "default") == 0) {
+			setenv("mtdids", (char *)mtdids_default);
+			setenv("mtdparts", (char *)mtdparts_default);
+			setenv("partition", NULL);
+
+			mtdparts_init();
+			return 0;
+		} else if (strcmp(argv[1], "delall") == 0) {
+			/* this may be the first run, initialize lists if needed */
+			mtdparts_init();
+
+			setenv("mtdparts", NULL);
+
+			/* mtd_devices_init() calls current_save() */
+			return mtd_devices_init();
+		}
+	}
+
+	/* make sure we are in sync with env variables */
+	if (mtdparts_init() != 0)
+		return 1;
+
+	if (argc == 1) {
+		list_partitions();
+		return 0;
+	}
+
+	/* mtdparts add <mtd-dev> <size>[@<offset>] <name> [ro] */
+	if (((argc == 5) || (argc == 6)) && (strcmp(argv[1], "add") == 0)) {
+#define PART_ADD_DESC_MAXLEN 64
+		char tmpbuf[PART_ADD_DESC_MAXLEN];
+		u8 type, num, len;
+		struct mtd_device *dev;
+		struct mtd_device *dev_tmp;
+		struct mtdids *id;
+		struct part_info *p;
+
+		if (mtd_id_parse(argv[2], NULL, &type, &num) != 0)
+			return 1;
+
+		if ((id = id_find(type, num)) == NULL) {
+			printf("no such device %s defined in mtdids variable\n", argv[2]);
+			return 1;
+		}
+
+		len = strlen(id->mtd_id) + 1;	/* 'mtd_id:' */
+		len += strlen(argv[3]);		/* size@offset */
+		len += strlen(argv[4]) + 2;	/* '(' name ')' */
+		if (argv[5] && (strlen(argv[5]) == 2))
+			len += 2;		/* 'ro' */
+
+		if (len >= PART_ADD_DESC_MAXLEN) {
+			printf("too long partition description\n");
+			return 1;
+		}
+		sprintf(tmpbuf, "%s:%s(%s)%s",
+				id->mtd_id, argv[3], argv[4], argv[5] ? argv[5] : "");
+		DEBUGF("add tmpbuf: %s\n", tmpbuf);
+
+		if ((device_parse(tmpbuf, NULL, &dev) != 0) || (!dev))
+			return 1;
+
+		DEBUGF("+ %s\t%d\t%s\n", MTD_DEV_TYPE(dev->id->type),
+				dev->id->num, dev->id->mtd_id);
+
+		if ((dev_tmp = device_find(dev->id->type, dev->id->num)) == NULL) {
+			device_add(dev);
+		} else {
+			/* merge new partition with existing ones*/
+			p = list_entry(dev->parts.next, struct part_info, link);
+			if (part_add(dev_tmp, p) != 0) {
+				device_del(dev);
+				return 1;
+			}
+		}
+
+		if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) {
+			printf("generated mtdparts too long, reseting to null\n");
+			return 1;
+		}
+
+		return 0;
+	}
+
+	/* mtdparts del part-id */
+	if ((argc == 3) && (strcmp(argv[1], "del") == 0)) {
+		DEBUGF("del: part-id = %s\n", argv[2]);
+
+		return delete_partition(argv[2]);
+	}
+
+	cmd_usage(cmdtp);
+	return 1;
+}
+
+/***************************************************/
+U_BOOT_CMD(
+	chpart,	2,	0,	do_chpart,
+	"change active partition",
+	"part-id\n"
+	"    - change active partition (e.g. part-id = nand0,1)\n"
+);
+
+U_BOOT_CMD(
+	mtdparts,	6,	0,	do_mtdparts,
+	"define flash/nand partitions",
+	"\n"
+	"    - list partition table\n"
+	"mtdparts delall\n"
+	"    - delete all partitions\n"
+	"mtdparts del part-id\n"
+	"    - delete partition (e.g. part-id = nand0,1)\n"
+	"mtdparts add <mtd-dev> <size>[@<offset>] [<name>] [ro]\n"
+	"    - add partition\n"
+	"mtdparts default\n"
+	"    - reset partition table to defaults\n\n"
+	"-----\n\n"
+	"this command uses three environment variables:\n\n"
+	"'partition' - keeps current partition identifier\n\n"
+	"partition  := <part-id>\n"
+	"<part-id>  := <dev-id>,part_num\n\n"
+	"'mtdids' - linux kernel mtd device id <-> u-boot device id mapping\n\n"
+	"mtdids=<idmap>[,<idmap>,...]\n\n"
+	"<idmap>    := <dev-id>=<mtd-id>\n"
+	"<dev-id>   := 'nand'|'nor'|'onenand'<dev-num>\n"
+	"<dev-num>  := mtd device number, 0...\n"
+	"<mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)\n\n"
+	"'mtdparts' - partition list\n\n"
+	"mtdparts=mtdparts=<mtd-def>[;<mtd-def>...]\n\n"
+	"<mtd-def>  := <mtd-id>:<part-def>[,<part-def>...]\n"
+	"<mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)\n"
+	"<part-def> := <size>[@<offset>][<name>][<ro-flag>]\n"
+	"<size>     := standard linux memsize OR '-' to denote all remaining space\n"
+	"<offset>   := partition start offset within the device\n"
+	"<name>     := '(' NAME ')'\n"
+	"<ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)\n"
+);
+/***************************************************/
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index e6623caf17..04b3200e57 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -29,7 +29,7 @@
 #include <jffs2/jffs2.h>
 #include <nand.h>
 
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 
 /* parition handling routines */
 int mtdparts_init(void);
@@ -105,7 +105,7 @@ static int
 arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size)
 {
 	int idx = nand_curr_device;
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 	struct mtd_device *dev;
 	struct part_info *part;
 	u8 pnum;
@@ -153,7 +153,7 @@ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size
 		*size = nand->size - *off;
 	}
 
-#if  defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if  defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 out:
 #endif
 	printf("device %d ", idx);
@@ -589,7 +589,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	char *boot_device = NULL;
 	int idx;
 	ulong addr, offset = 0;
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 	struct mtd_device *dev;
 	struct part_info *part;
 	u8 pnum;
@@ -634,7 +634,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		offset = simple_strtoul(argv[3], NULL, 16);
 		break;
 	default:
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_CMD_MTDPARTS)
 usage:
 #endif
 		cmd_usage(cmdtp);
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 205dd1f659..db1f55c84a 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -58,6 +58,7 @@
 #define CONFIG_CMD_MII		/* MII support			*/
 #define CONFIG_CMD_MISC		/* Misc functions like sleep etc*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
+#define CONFIG_CMD_MTDPARTS	/* mtd parts support		*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 #define CONFIG_CMD_NFS		/* NFS support			*/
diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index e61a3e1095..0977bee35d 100644
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -673,14 +673,14 @@
  *
  */
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 2581fdfefd..576aa74062 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -320,7 +320,7 @@
 
 /* No command line, one static partition */
 /*
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0x00400000
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -328,7 +328,7 @@
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=alaska-0"
 #define MTDPARTS_DEFAULT	"mtdparts=alaska-0:4m(user)"
 */
diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 1910b34639..40a1c40cc4 100644
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -219,7 +219,7 @@
  *
  */
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -229,7 +229,7 @@
  * Note: fake mtd_id used, no linux mtd map file
  */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=bab7xx-0"
 #define MTDPARTS_DEFAULT	"mtdparts=bab7xx-0:-(jffs2)"
 */
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index bced118e38..9934f29b7f 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -346,7 +346,7 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (in ms)	*/
 
 /* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM5200-0"
 #define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:640k(firmware),"	\
 						"1408k(kernel),"	\
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index fa9fc23823..39f41e6a2d 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -781,7 +781,7 @@
  *
  */
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nand"
 #define CONFIG_JFFS2_PART_SIZE		0x00200000
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -791,7 +791,7 @@
  * Note: fake mtd_id used, no linux mtd map file
  */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nand0=catcenter"
 #define MTDPARTS_DEFAULT	"mtdparts=catcenter:2m(nand)"
 */
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index daed9342b3..160871b24e 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -230,7 +230,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor1"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -242,7 +242,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
  * Note: fake mtd_id's used, no linux mtd map file.
  */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor1=db64360-1"
 #define MTDPARTS_DEFAULT	"mtdparts=db64360-1:-(jffs2)"
 */
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 604fd45af7..06fd157ad2 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -168,7 +168,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor1"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -180,7 +180,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
  * Note: fake mtd_id's used, no linux mtd map file.
  */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor1=db64460-1"
 #define MTDPARTS_DEFAULT	"mtdparts=db64460-1:-(jffs2)"
 */
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index 6fdc566002..db9c17df91 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -539,14 +539,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index 1d031f1cde..3bd270cdf2 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -545,14 +545,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h
index 79392668e0..d2aa8b92e4 100644
--- a/include/configs/ELPPC.h
+++ b/include/configs/ELPPC.h
@@ -196,7 +196,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -204,7 +204,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=elppc-0,nor1=elppc-1"
 #define MTDPARTS_DEFAULT	"mtdparts=elppc-0:-(jffs2),elppc-1:-(user)"
 */
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 08408e2c31..f152230da7 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -216,7 +216,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index e5f3b606ed..5eaed842bf 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -216,7 +216,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index f14d9455d7..6e8a4b8085 100644
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -352,14 +352,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index 8e7f9cdc14..19a288c582 100644
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -200,7 +200,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -208,7 +208,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=mhpc-0"
 #define MTDPARTS_DEFAULT	"mtdparts=mhpc-0:-(jffs2)"
 */
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index c58ce053fd..a3869c8747 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -243,7 +243,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -251,7 +251,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=mip405-0"
 #define MTDPARTS_DEFAULT	"mtdparts=mip405-0:-(jffs2)"
 */
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 1902397325..5fcc1733bc 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -249,7 +249,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00080000
@@ -257,7 +257,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=ml2-0"
 #define MTDPARTS_DEFAULT	"mtdparts=ml2-0:-@512k(jffs2)"
 */
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index fe1cc17960..4fd86d3923 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -563,14 +563,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 0b97f0ce66..6343cfed1f 100644
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -440,13 +440,13 @@
  */
 
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nand0"
 #define CONFIG_JFFS2_PART_SIZE		0x00400000
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=nc650-0,nand0=nc650-nand"
 
 #define MTDPARTS_DEFAULT	"mtdparts=nc650-0:1m(kernel1),1m(kernel2)," \
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 34fdba59c0..724e807398 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -702,7 +702,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nand0"
 #define CONFIG_JFFS2_PART_SIZE		0x00100000
 #define CONFIG_JFFS2_PART_OFFSET	0x00200000
@@ -710,7 +710,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nand0=netta-nand"
 #define MTDPARTS_DEFAULT	"mtdparts=netta-nand:1m@2m(jffs2)"
 */
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index d2eae1d7fa..16baf8c9be 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -804,14 +804,14 @@
  */
 
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nand0"
 #define CONFIG_JFFS2_PART_SIZE		0x00400000
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=PPChameleon-0,nand0=ppchameleonevb-nand"
 */
 
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index bab44606da..830f4bc59b 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -167,14 +167,14 @@
  */
 /* No command line, one static partition
  * use all the space starting at offset 3MB*/
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00300000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=r360-0"
 #define MTDPARTS_DEFAULT	"mtdparts=r360-0:-@3m(user)"
 */
diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 280175af1a..f36244d12c 100644
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -429,7 +429,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -437,7 +437,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 01d0d5fc3b..5b6f27186b 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -202,7 +202,7 @@
  *
  */
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00100000
@@ -210,7 +210,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=rattler-0"
 #define MTDPARTS_DEFAULT	"mtdparts=rattler-0:-@1m(jffs2)"
 */
diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index b939cfa79f..e20527e4f9 100644
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -189,7 +189,7 @@
 #define CONFIG_JFFS2_DEV	"nand0"
 
 /* mtdparts command line support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nand0=nand0"
 #define MTDPARTS_DEFAULT	"mtdparts=nand0:2M(u-boot),6M(kernel),-(jffs2)"
 
diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 9857bf605c..cac04b4017 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -174,7 +174,7 @@
  *
  */
 /* No command line, one static partition */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 
 /*
 #define CONFIG_JFFS2_DEV		"nor0"
@@ -189,7 +189,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=sixnet-0,nand0=sixnet-nand"
 #define MTDPARTS_DEFAULT	"mtdparts=sixnet-0:7680k@512k();sixnet-nand:2m(jffs2-nand)"
 */
diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index b42d3d944d..92b4fa503e 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -275,7 +275,7 @@
 					   (= chip selects) */
 
 /* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM5200-0"
 #if defined(CONFIG_TQM5200_B)
 #define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:768k(firmware),"	\
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 6850eba15d..d374981abc 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -407,7 +407,7 @@
 #endif
 
 /* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM5200-0"
 
 #ifdef CONFIG_STK52XX
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 8934d51bfa..87e5a650d2 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -231,7 +231,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index fd4157343c..f6664437d3 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -227,7 +227,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index e126dc38cb..b74b4046a5 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -537,7 +537,7 @@ extern int tqm834x_num_flash_banks;
  * JFFS2 partitions
  */
 /* mtdparts command line support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM834x-0"
 
 /* default mtd partition table */
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 77eb5a96dc..dc80b4746d 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -216,7 +216,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index bb8825b9e9..22894432cb 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -216,7 +216,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 2ccbaf8952..999bdaadcb 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -221,7 +221,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 8a65183583..b54967dae7 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -256,7 +256,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 3b2272c231..72db26c7b1 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -597,14 +597,14 @@
 
 #define	CONFIG_JFFS2_NAND	1
 
-#ifdef CONFIG_JFFS2_CMDLINE
+#ifdef CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nand0=TQM85xx-nand"
 #define MTDPARTS_DEFAULT	"mtdparts=TQM85xx-nand:-"
 #else
 #define CONFIG_JFFS2_DEV 	"nand0"	/* NAND device jffs2 lives on	*/
 #define CONFIG_JFFS2_PART_OFFSET 0	/* start of jffs2 partition	*/
 #define CONFIG_JFFS2_PART_SIZE	0x200000 /* size of jffs2 partition	*/
-#endif /* CONFIG_JFFS2_CMDLINE */
+#endif /* CONFIG_CMD_MTDPARTS */
 
 #endif /* CONFIG_NAND */
 
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index 8bd1fe062a..2e2a165b8a 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -220,7 +220,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index ad2c71ce03..1148f2e4ef 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -221,7 +221,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 0a5180e4f3..577f982c5a 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -224,7 +224,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index ee6980c81d..69070e6459 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -225,7 +225,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 421a2d8689..bb6861470f 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -265,7 +265,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxM-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxM-0:512k(u-boot),"	\
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 08c4ced1c9..b73aaa817b 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -130,7 +130,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -138,7 +138,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor1=zuma-1,nor2=zuma-2"
 #define MTDPARTS_DEFAULT	"mtdparts=zuma-1:-(jffs2),zuma-2:-(user)"
 */
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index dff47fc6a6..f83dd9c243 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -258,7 +258,7 @@
 #define CONFIG_ENV_ADDR		0x00020000
 
 #ifdef CONFIG_SYS_USE_UBI
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"onenand0=onenand"
 #define MTDPARTS_DEFAULT	"mtdparts=onenand:128k(bootloader),"	\
 					"128k(params),"			\
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index ddcc6aad46..54cf40d67f 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -222,7 +222,7 @@
 /*
  * MTD configuration
  */
-#define CONFIG_JFFS2_CMDLINE	1
+#define CONFIG_CMD_MTDPARTS	1
 #define MTDIDS_DEFAULT		"nor0=cm5200-0"
 #define MTDPARTS_DEFAULT	"mtdparts=cm5200-0:"			\
 					"384k(uboot),128k(env),"	\
diff --git a/include/configs/debris.h b/include/configs/debris.h
index 4d65f6a44b..dc59df9c44 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -234,7 +234,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -246,7 +246,7 @@
  * Note: fake mtd_id's used, no linux mtd map file.
  */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=debris-0"
 #define MTDPARTS_DEFAULT	"mtdparts=debris-0:-(jffs2)"
 */
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 0581842ec2..322a3ca41a 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -158,7 +158,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -166,7 +166,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=ep7312-0"
 #define MTDPARTS_DEFAULT	"mtdparts=ep7312-0:-(jffs2)"
 */
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index d49d02f287..3f4425abc8 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -758,7 +758,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -766,7 +766,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
index 58445674c3..27c6e7d4a7 100644
--- a/include/configs/fx12mm.h
+++ b/include/configs/fx12mm.h
@@ -37,7 +37,7 @@
 
 /* cmd config */
 #define CONFIG_CMD_JFFS2
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #undef CONFIG_CMD_NET
 
 /* sdram */
diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 0fdcda2301..2dacfb6e07 100644
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -730,14 +730,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		""
 #define MTDPARTS_DEFAULT	""
 */
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 1dd89f90c7..944d06fbfc 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -229,7 +229,7 @@
 
 
 /* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=idmr-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=idmr-0:128k(u-boot),"	\
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index bb3c02e72a..a3d023f630 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -160,14 +160,14 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00020000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=impA7 NOR Flash Bank #0,nor1=impA7 NOR Flash Bank #1"
 #define MTDPARTS_DEFAULT	"mtdparts=impA7 NOR Flash Bank #0:-(FileSystem1);impA7 NOR Flash Bank #1:-(FileSystem2)"
 */
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 6c150aed39..9ac6eec3b4 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -170,7 +170,7 @@
 /*
  * JFFS2 partitions
  */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV	"nor0"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 2dd9e92f87..cbc0b9259a 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -175,7 +175,7 @@
 /*
  * JFFS2 partitions
  */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV	"nor0"
 
 /* EET platform additions */
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index a18ba80192..2129dfd804 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -168,14 +168,14 @@
  * JFFS2 partitions
  */
 /* No command line, one static partition, use all space on the device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor1"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=INCA-IP Bank 0"
 #define MTDPARTS_DEFAULT	"mtdparts=INCA-IP Bank 0:192k(uboot)," \
 							"64k(env)," \
diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index d9b155548a..043ae2f364 100644
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -203,7 +203,7 @@
 */
 
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -211,7 +211,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=innokom-0"
 */
 
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index ac18c8776d..aa117c8f71 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -259,7 +259,7 @@
 
 #if defined(CONFIG_CMD_JFFS2)
 /* JFFS2 partitions */
-#define CONFIG_JFFS2_CMDLINE	/* mtdparts command line support */
+#define CONFIG_CMD_MTDPARTS	/* mtdparts command line support */
 #define MTDIDS_DEFAULT		"nor0=ml401-0"
 
 /* default mtd partition table */
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index c4f5286880..27213a8d8d 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -182,7 +182,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00080000
@@ -190,7 +190,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=modnet50-0"
 #define MTDPARTS_DEFAULT	"mtdparts=modnet50-0:-@512k(jffs2)"
 */
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index e6e3729a20..99a02cc223 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -275,7 +275,7 @@
 /*
  * MTD configuration
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=motionpro-0"
 #define MTDPARTS_DEFAULT	"mtdparts=motionpro-0:"			  \
 					"13m(fs),2m(kernel),256k(uboot)," \
diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index aaa4e98522..a19eb78409 100644
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -176,7 +176,7 @@
  */
 /* No command line, one static partition, whole device */
 /*
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00050000
@@ -184,7 +184,7 @@
 
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=mx1fs2-0"
 
 #ifdef BUS32BIT_VERSION
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 1649f1fa85..c31c06acc4 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -194,7 +194,7 @@
 /*
  * JFFS2 partitions
  */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV	"nor0"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index 3b22e48d8d..0b38549dff 100644
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -121,7 +121,7 @@
 /*
  * partitions (mtdparts command line support)
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=omapflash.0,nand0=omapnand.0"
 #define MTDPARTS_DEFAULT	"mtdparts=" \
 	"omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 92df0b4fdc..983b5f2517 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -296,7 +296,7 @@
  * JFFS2 partitions
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor1"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -304,7 +304,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor1=omap2420-1"
 #define MTDPARTS_DEFAULT	"mtdparts=omap2420-1:-(jffs2)"
 */
diff --git a/include/configs/qong.h b/include/configs/qong.h
index ccc2625135..a67006aa2d 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -212,7 +212,7 @@
 /*
  * JFFS2 partitions
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=physmap-flash.0"
 #define MTDPARTS_DEFAULT	\
 	"mtdparts=physmap-flash.0:256k(U-Boot),128k(env1),"	\
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 515b09789e..5b68ef9875 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -430,7 +430,7 @@ extern unsigned long offsetOfEnvironment;
 #define CONFIG_JFFS2_NAND 1			/* jffs2 on nand support */
 
 /* No command line, one static partition */
-#undef	CONFIG_JFFS2_CMDLINE
+#undef	CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nand0"
 #define CONFIG_JFFS2_PART_SIZE		0x01000000
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index 82faca8100..960350c6c6 100644
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -159,14 +159,14 @@
  * JFFS2 partitions
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
 
 /* mtdparts command line support */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=SC520CDP Flash Bank #0"
 #define MTDPARTS_DEFAULT	"mtdparts=SC520CDP Flash Bank #0:-(jffs2)"
 */
diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index 36441696ad..2445a34168 100644
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -177,7 +177,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -185,7 +185,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=sc520_spunk-0"
 #define MTDPARTS_DEFAULT	"mtdparts=sc520_spunk-0:-(jffs2)"
 */
diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h
index a3f2677387..35f3e3a022 100644
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -214,7 +214,7 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (in ms)	*/
 
 /* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM5200-0"
 #define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:640k(firmware),"	\
 						"1408k(kernel),"	\
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 0a7a73d30c..8f13c35614 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -375,7 +375,7 @@
 #define	CONFIG_SYS_MONITOR_LEN		(256 << 10)
 
 /* Dynamic MTD partition support */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=0"
 
 /* production flash layout */
diff --git a/include/configs/v37.h b/include/configs/v37.h
index a6b0f0daf0..7f1670eafe 100644
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -106,7 +106,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor1"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -114,7 +114,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor1=v37-1"
 #define MTDPARTS_DEFAULT	"mtdparts=v37-1:-(jffs2)"
 */
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 391535ed2c..5371e2d7f6 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -286,7 +286,7 @@ int vct_gpio_get(int pin);
 #define	CONFIG_CMD_UBI
 #define	CONFIG_RBTREE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 
 #define MTDIDS_DEFAULT		"onenand0=onenand"
 #define MTDPARTS_DEFAULT	"mtdparts=onenand:128k(u-boot),"	\
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 7b61c82af3..021012d0f9 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -225,7 +225,7 @@
 /*-----------------------------------------------------------------------
  * Dynamic MTD partition support
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=TQM8xxL-0"
 
 #define MTDPARTS_DEFAULT	"mtdparts=TQM8xxL-0:256k(u-boot),"	\
diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index f4606102a9..cadd90633d 100644
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -189,7 +189,7 @@
 /*
  * JFFS2 partitions (mtdparts command line support)
  */
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=omapflash.0"
 #define MTDPARTS_DEFAULT	"mtdparts=omapflash.0:256k(u-boot),64k(env),64k(r_env),16192k(data0),-(data1)"
 
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index e7daa0771e..e3ea84b315 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -41,7 +41,7 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_JFFS2
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #undef CONFIG_CMD_SPI
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_DTT
@@ -108,7 +108,7 @@
 #define	CONFIG_SYS_MAX_FLASH_BANKS	1
 #define	CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_CMD_JFFS2
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 6761438656..5d13f9682e 100644
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -62,7 +62,7 @@
  * JFFS2 partitions
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV		"nor0"
 #define CONFIG_JFFS2_PART_SIZE		0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET	0x00000000
@@ -70,7 +70,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT		"nor0=xsengine-0"
 #define MTDPARTS_DEFAULT	"mtdparts=xsengine-0:256k(uboot),1m(kernel1),8m(kernel2)"
 */