* Copyright (C) 2008 Samsung Electronics
* Kyungmin Park <kyungmin.park@samsung.com>
*
- * Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
+ * Copyright 2008-2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#define DEV_TYPE_NONE 0
#define DEV_TYPE_NAND 1
#define DEV_TYPE_ONENAND 2
+#define DEV_TYPE_NOR 3
/* Private own data */
static struct ubi_device *ubi;
+static char buffer[80];
+static int ubi_initialized;
struct selected_dev {
- char dev_name[32]; /* NAND/OneNAND etc */
char part_name[80];
- int type;
+ int selected;
int nr;
struct mtd_info *mtd_info;
};
return 0;
}
-static int parse_num(size_t *num, const char *token)
-{
- char *endp;
- size_t n;
-
- n = (size_t) ustrtoul(token, &endp, 0);
- if (*endp)
- return -EINVAL;
-
- *num = n;
- return 0;
-}
-
static int verify_mkvol_req(const struct ubi_device *ubi,
const struct ubi_mkvol_req *req)
{
{
int i, err, reserved_pebs;
int found = 0, vol_id = 0;
- struct ubi_volume *vol;
+ struct ubi_volume *vol = NULL;
for (i = 0; i < ubi->vtbl_slots; i++) {
vol = ubi->volumes[i];
}
if (i == ubi->vtbl_slots) {
printf("%s volume not found\n", volume);
- return 0;
+ return -ENODEV;
}
printf("read %i bytes from volume %d to %x(buf address)\n",
tmp = offp;
off = do_div(tmp, vol->usable_leb_size);
lnum = tmp;
- printf("off=%d lnum=%d\n", off, lnum);
do {
if (off + len >= vol->usable_leb_size)
len = vol->usable_leb_size - off;
size -= len;
offp += len;
- printf("buf = %x\n", (unsigned)buf);
memcpy(buf, tbuf, len);
- printf("buf[0] = %x\n", buf[0]);
buf += len;
len = size > tbuf_size ? tbuf_size : size;
return err ? err : count_save - size;
}
-static int ubi_dev_scan(struct mtd_info *info, char *ubidev)
+static int ubi_dev_scan(struct mtd_info *info, char *ubidev,
+ const char *vid_header_offset)
{
struct mtd_device *dev;
struct part_info *part;
struct mtd_partition mtd_part;
- char buffer[32];
+ char ubi_mtd_param_buffer[80];
u8 pnum;
int err;
- if (mtdparts_init() != 0)
- return 1;
-
if (find_dev_and_part(ubidev, &dev, &pnum, &part) != 0)
return 1;
mtd_part.offset = part->offset;
add_mtd_partitions(info, &mtd_part, 1);
- err = ubi_mtd_param_parse(buffer, NULL);
+ strcpy(ubi_mtd_param_buffer, buffer);
+ if (vid_header_offset)
+ sprintf(ubi_mtd_param_buffer, "mtd=%d,%s", pnum,
+ vid_header_offset);
+ err = ubi_mtd_param_parse(ubi_mtd_param_buffer, NULL);
if (err) {
del_mtd_partitions(info);
return err;
return err;
}
+ ubi_initialized = 1;
+
return 0;
}
int err = 0;
if (argc < 2) {
- printf("Usage:\n%s\n", cmdtp->usage);
+ cmd_usage(cmdtp);
+ return 1;
+ }
+
+ if (mtdparts_init() != 0) {
+ printf("Error initializing mtdparts!\n");
return 1;
}
if (strcmp(argv[1], "part") == 0) {
+ char mtd_dev[16];
+ struct mtd_device *dev;
+ struct part_info *part;
+ const char *vid_header_offset = NULL;
+ u8 pnum;
+
/* Print current partition */
if (argc == 2) {
- if (ubi_dev.type == DEV_TYPE_NONE) {
+ if (!ubi_dev.selected) {
printf("Error, no UBI device/partition selected!\n");
return 1;
}
- printf("%s Device %d: %s, partition %s\n", ubi_dev.dev_name,
+ printf("Device %d: %s, partition %s\n",
ubi_dev.nr, ubi_dev.mtd_info->name, ubi_dev.part_name);
return 0;
}
- if (argc < 4) {
- printf("Usage:\n%s\n", cmdtp->usage);
+ if (argc < 3) {
+ cmd_usage(cmdtp);
return 1;
}
ubi_dev.nr = 0;
/*
- * Check for nand|onenand selection
+ * Call ubi_exit() before re-initializing the UBI subsystem
*/
-#if defined(CONFIG_CMD_NAND)
- if (strcmp(argv[2], "nand") == 0) {
- strcpy(ubi_dev.dev_name, "NAND");
- ubi_dev.type = DEV_TYPE_NAND;
- ubi_dev.mtd_info = &nand_info[ubi_dev.nr];
- }
-#endif
-#if defined(CONFIG_CMD_ONENAND)
- if (strcmp(argv[2], "onenand") == 0) {
- strcpy(ubi_dev.dev_name, "OneNAND");
- ubi_dev.type = DEV_TYPE_ONENAND;
- ubi_dev.mtd_info = &onenand_mtd;
+ if (ubi_initialized) {
+ ubi_exit();
+ del_mtd_partitions(ubi_dev.mtd_info);
}
-#endif
- if (ubi_dev.type == DEV_TYPE_NONE) {
- printf("Error, no UBI device/partition selected!\n");
+ /*
+ * Search the mtd device number where this partition
+ * is located
+ */
+ if (find_dev_and_part(argv[2], &dev, &pnum, &part)) {
+ printf("Partition %s not found!\n", argv[2]);
return 1;
}
+ sprintf(mtd_dev, "%s%d", MTD_DEV_TYPE(dev->id->type), dev->id->num);
+ ubi_dev.mtd_info = get_mtd_device_nm(mtd_dev);
+ if (IS_ERR(ubi_dev.mtd_info)) {
+ printf("Partition %s not found on device %s!\n", argv[2], mtd_dev);
+ return 1;
+ }
+
+ ubi_dev.selected = 1;
- strcpy(ubi_dev.part_name, argv[3]);
- err = ubi_dev_scan(ubi_dev.mtd_info, ubi_dev.part_name);
+ if (argc > 3)
+ vid_header_offset = argv[3];
+ strcpy(ubi_dev.part_name, argv[2]);
+ err = ubi_dev_scan(ubi_dev.mtd_info, ubi_dev.part_name,
+ vid_header_offset);
if (err) {
printf("UBI init error %d\n", err);
+ ubi_dev.selected = 0;
return err;
}
return 0;
}
- if ((strcmp(argv[1], "part") != 0) && (ubi_dev.type == DEV_TYPE_NONE)) {
+ if ((strcmp(argv[1], "part") != 0) && (!ubi_dev.selected)) {
printf("Error, no UBI device/partition selected!\n");
return 1;
}
}
/* E.g., create volume size */
if (argc == 4) {
- err = parse_num(&size, argv[3]);
- if (err) {
- printf("Incorrect type\n");
- return err;
- }
+ size = simple_strtoul(argv[3], NULL, 16);
argc--;
}
/* Use maximum available size */
}
addr = simple_strtoul(argv[2], NULL, 16);
- err = parse_num(&size, argv[4]);
- if (err) {
- printf("Please see usage\n");
- return err;
- }
+ size = simple_strtoul(argv[4], NULL, 16);
return ubi_volume_write(argv[3], (void *)addr, size);
}
/* E.g., read volume size */
if (argc == 5) {
- err = parse_num(&size, argv[4]);
- if (err) {
- printf("Please see usage\n");
- return err;
- }
+ size = simple_strtoul(argv[4], NULL, 16);
argc--;
}
}
U_BOOT_CMD(ubi, 6, 1, do_ubi,
- "ubi - ubi commands\n",
- "part [nand|onenand] [part]"
- " - Show or set current partition\n"
+ "ubi commands",
+ "part [part] [offset]\n"
+ " - Show or set current partition (with optional VID"
+ " header offset)\n"
"ubi info [l[ayout]]"
" - Display volume and ubi layout information\n"
"ubi create[vol] volume [size] [type]"
"ubi remove[vol] volume"
" - Remove volume\n"
"[Legends]\n"
- " volume: charater name\n"
- " size: KiB, MiB, GiB, and bytes\n"
- " type: s[tatic] or d[ynamic] (default=dynamic)\n"
+ " volume: character name\n"
+ " size: specified in bytes\n"
+ " type: s[tatic] or d[ynamic] (default=dynamic)"
);