diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
| commit | 88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch) | |
| tree | 0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /cmd/fat.c | |
| parent | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff) | |
| parent | 608e399fdef82e983db44c5cb8f5e772bba870e2 (diff) | |
| download | blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.tar.gz blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'cmd/fat.c')
| -rw-r--r-- | cmd/fat.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -69,7 +69,7 @@ static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int dev, part; - block_dev_desc_t *dev_desc; + struct blk_desc *dev_desc; disk_partition_t info; if (argc < 2) { @@ -77,11 +77,11 @@ static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, 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; - dev = dev_desc->dev; + dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { printf("\n** Unable to use %s %d:%d for fatinfo **\n", argv[1], dev, part); @@ -105,7 +105,7 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag, int ret; unsigned long addr; unsigned long count; - block_dev_desc_t *dev_desc = NULL; + struct blk_desc *dev_desc = NULL; disk_partition_t info; int dev = 0; int part = 1; @@ -114,11 +114,11 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag, 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; - dev = dev_desc->dev; + dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { printf("\n** Unable to use %s %d:%d for fatwrite **\n", |
