diff options
| author | Tien Fong Chee <tien.fong.chee@intel.com> | 2018-07-06 16:26:01 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-28 20:22:32 -0400 |
| commit | 14dfc6482a9057472ea202d2df4133a45bc3c1bc (patch) | |
| tree | 34b56c6fccaed666df1bf0fa5a245da6c40078a2 | |
| parent | 10c2044062d045e27cbcda739501b96f670fb7f1 (diff) | |
| download | u-boot-14dfc6482a9057472ea202d2df4133a45bc3c1bc.tar.gz | |
cmd: ubifs: Factor out some checking codes into cmd_ubifs_mount()
cmd_ubifs_mount() function would be called directly instead of
involving whole command machinery for mounting ubifs in
generic firmware loader, so some checking codes need to be factored out
into cmd_ubifs_mount() without breaking original functionality design.
Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
| -rw-r--r-- | cmd/ubifs.c | 22 | ||||
| -rw-r--r-- | include/ubi_uboot.h | 1 |
2 files changed, 15 insertions, 8 deletions
diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 171034801b..e4000b7ad1 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -19,16 +19,10 @@ static int ubifs_initialized; static int ubifs_mounted; -static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +int cmd_ubifs_mount(char *vol_name) { - char *vol_name; int ret; - if (argc != 2) - return CMD_RET_USAGE; - - vol_name = argv[1]; debug("Using volume %s\n", vol_name); if (ubifs_initialized == 0) { @@ -42,7 +36,19 @@ static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, ubifs_mounted = 1; - return 0; + return ret; +} +static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + char *vol_name; + + if (argc != 2) + return CMD_RET_USAGE; + + vol_name = argv[1]; + + return cmd_ubifs_mount(vol_name); } int ubifs_is_mounted(void) diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 827dbfcd10..0770228cd8 100644 --- a/include/ubi_uboot.h +++ b/include/ubi_uboot.h @@ -75,6 +75,7 @@ extern int ubi_volume_write(char *volume, void *buf, size_t size); extern int ubi_volume_read(char *volume, char *buf, size_t size); extern struct ubi_device *ubi_devices[]; +int cmd_ubifs_mount(char *vol_name); int cmd_ubifs_umount(void); #endif |