diff options
| author | Stefan Roese <sr@denx.de> | 2008-11-27 14:07:09 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-12-09 10:07:36 +0100 |
| commit | 2ee951ba2ac9874d2a93d52e7a187d3184be937e (patch) | |
| tree | d377165f9fc4d4bd1ac89ff00253681f269c0100 | |
| parent | 9def12cae33d2d3ea2dd56b197fd3dfb3ad60bf4 (diff) | |
| download | u-boot-imx-2ee951ba2ac9874d2a93d52e7a187d3184be937e.zip u-boot-imx-2ee951ba2ac9874d2a93d52e7a187d3184be937e.tar.gz u-boot-imx-2ee951ba2ac9874d2a93d52e7a187d3184be937e.tar.bz2 | |
UBI: Enable re-initializing of the "ubi part" command
With this patch now, the user can call "ubi part" multiple times to
re-connect the UBI device to another MTD partition.
Signed-off-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | common/cmd_ubi.c | 11 | ||||
| -rw-r--r-- | drivers/mtd/ubi/build.c | 1 | ||||
| -rw-r--r-- | include/ubi_uboot.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 8446765..495d71e 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -31,6 +31,7 @@ /* 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 */ @@ -428,6 +429,8 @@ static int ubi_dev_scan(struct mtd_info *info, char *ubidev) return err; } + ubi_initialized = 1; + return 0; } @@ -464,6 +467,14 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ubi_dev.nr = 0; /* + * Call ubi_exit() before re-initializing the UBI subsystem + */ + if (ubi_initialized) { + ubi_exit(); + del_mtd_partitions(ubi_dev.mtd_info); + } + + /* * Check for nand|onenand selection */ #if defined(CONFIG_CMD_NAND) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 17cabb2..bdf75c9 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1059,6 +1059,7 @@ void __exit ubi_exit(void) misc_deregister(&ubi_ctrl_cdev); class_remove_file(ubi_class, &ubi_version); class_destroy(ubi_class); + mtd_devs = 0; } module_exit(ubi_exit); diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 295f2c0..095dfc1 100644 --- a/include/ubi_uboot.h +++ b/include/ubi_uboot.h @@ -211,6 +211,7 @@ static inline long IS_ERR(const void *ptr) /* functions */ extern int ubi_mtd_param_parse(const char *val, struct kernel_param *kp); extern int ubi_init(void); +extern void ubi_exit(void); extern struct ubi_device *ubi_devices[]; |