projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spi: Migrate CONFIG_SH_QSPI to Kconfig
[oweals/u-boot.git]
/
cmd
/
fat.c
diff --git
a/cmd/fat.c
b/cmd/fat.c
index 82b9b38c2c56f9bd3b4e49010f24c9b968b65eb4..ad1dc2a49f1162ce52eaab706817bbbec5aeef8e 100644
(file)
--- a/
cmd/fat.c
+++ b/
cmd/fat.c
@@
-77,11
+77,11
@@
static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc,
return 0;
}
return 0;
}
- part =
get_device_and_partition
(argv[1], argv[2], &dev_desc, &info, 1);
+ part =
blk_get_device_part_str
(argv[1], argv[2], &dev_desc, &info, 1);
if (part < 0)
return 1;
if (part < 0)
return 1;
- dev = dev_desc->dev;
+ dev = dev_desc->dev
num
;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
printf("\n** Unable to use %s %d:%d for fatinfo **\n",
argv[1], dev, part);
if (fat_set_blk_dev(dev_desc, &info) != 0) {
printf("\n** Unable to use %s %d:%d for fatinfo **\n",
argv[1], dev, part);
@@
-114,11
+114,11
@@
static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
if (argc < 5)
return cmd_usage(cmdtp);
if (argc < 5)
return cmd_usage(cmdtp);
- part =
get_device_and_partition
(argv[1], argv[2], &dev_desc, &info, 1);
+ part =
blk_get_device_part_str
(argv[1], argv[2], &dev_desc, &info, 1);
if (part < 0)
return 1;
if (part < 0)
return 1;
- dev = dev_desc->dev;
+ dev = dev_desc->dev
num
;
if (fat_set_blk_dev(dev_desc, &info) != 0) {
printf("\n** Unable to use %s %d:%d for fatwrite **\n",
if (fat_set_blk_dev(dev_desc, &info) != 0) {
printf("\n** Unable to use %s %d:%d for fatwrite **\n",
@@
-126,7
+126,7
@@
static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
return 1;
}
addr = simple_strtoul(argv[3], NULL, 16);
return 1;
}
addr = simple_strtoul(argv[3], NULL, 16);
- count = simple_strtoul(argv[5], NULL, 16);
+ count =
(argc <= 5) ? 0 :
simple_strtoul(argv[5], NULL, 16);
buf = map_sysmem(addr, count);
ret = file_fat_write(argv[4], buf, 0, count, &size);
buf = map_sysmem(addr, count);
ret = file_fat_write(argv[4], buf, 0, count, &size);
@@
-145,7
+145,7
@@
static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
U_BOOT_CMD(
fatwrite, 6, 0, do_fat_fswrite,
"write file into a dos filesystem",
U_BOOT_CMD(
fatwrite, 6, 0, do_fat_fswrite,
"write file into a dos filesystem",
- "<interface> <dev[:part]> <addr> <filename>
<bytes>
\n"
+ "<interface> <dev[:part]> <addr> <filename>
[<bytes>]
\n"
" - write file 'filename' from the address 'addr' in RAM\n"
" to 'dev' on 'interface'"
);
" - write file 'filename' from the address 'addr' in RAM\n"
" to 'dev' on 'interface'"
);