diff options
Diffstat (limited to 'common/cmd_jffs2.c')
| -rw-r--r-- | common/cmd_jffs2.c | 1731 | 
1 files changed, 6 insertions, 1725 deletions
| diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index d0a7ceaa5..860d1d97e 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 */ -  /***************************************************/ |