Merge branch '2019-10-28-azure-ci-support'

[oweals/u-boot.git] / cmd / fat.c

diff --git a/cmd/fat.c b/cmd/fat.c
index aae993d2b9a486c7ca1bdc16c10f7c84e9c817b9..4b9a7eaab05499c017e164c41cbdc492e7026f55 100644 (file)
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Richard Jones, rjones@nexus-tech.net
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -69,7 +68,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 +76,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 +104,8 @@ 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;
+       long offset;
+       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",
@@ -126,10 +126,12 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
                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);
+       /* offset should be a hex, but "-1" is allowed */
+       offset = (argc <= 6) ? 0 : simple_strtol(argv[6], NULL, 16);
 
        buf = map_sysmem(addr, count);
-       ret = file_fat_write(argv[4], buf, 0, count, &size);
+       ret = file_fat_write(argv[4], buf, offset, count, &size);
        unmap_sysmem(buf);
        if (ret < 0) {
                printf("\n** Unable to write \"%s\" from %s %d:%d **\n",
@@ -143,10 +145,35 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
 }
 
 U_BOOT_CMD(
-       fatwrite,       6,      0,      do_fat_fswrite,
+       fatwrite,       7,      0,      do_fat_fswrite,
        "write file into a dos filesystem",
-       "<interface> <dev[:part]> <addr> <filename> <bytes>\n"
+       "<interface> <dev[:part]> <addr> <filename> [<bytes> [<offset>]]\n"
        "    - write file 'filename' from the address 'addr' in RAM\n"
        "      to 'dev' on 'interface'"
 );
+
+static int do_fat_rm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       return do_rm(cmdtp, flag, argc, argv, FS_TYPE_FAT);
+}
+
+U_BOOT_CMD(
+       fatrm,  4,      1,      do_fat_rm,
+       "delete a file",
+       "<interface> [<dev[:part]>] <filename>\n"
+       "    - delete a file from 'dev' on 'interface'"
+);
+
+static int do_fat_mkdir(cmd_tbl_t *cmdtp, int flag, int argc,
+                       char * const argv[])
+{
+       return do_mkdir(cmdtp, flag, argc, argv, FS_TYPE_FAT);
+}
+
+U_BOOT_CMD(
+       fatmkdir,       4,      1,      do_fat_mkdir,
+       "create a directory",
+       "<interface> [<dev[:part]>] <directory>\n"
+       "    - create a directory in 'dev' on 'interface'"
+);
 #endif