Merge tag 'u-boot-rockchip-20200522' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/cmd/fat.c b/cmd/fat.c
index ad1dc2a49f1162ce52eaab706817bbbec5aeef8e..b438ce16c91136d1c645c5546064b799eab599ee 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+
  */
 
 /*
@@ -10,16 +9,13 @@
  */
 #include <common.h>
 #include <command.h>
-#include <s_record.h>
-#include <net.h>
-#include <ata.h>
-#include <asm/io.h>
 #include <mapmem.h>
-#include <part.h>
 #include <fat.h>
 #include <fs.h>
+#include <part.h>
+#include <asm/cache.h>
 
-int do_fat_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        return do_size(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -32,7 +28,7 @@ U_BOOT_CMD(
        "      and determine its size."
 );
 
-int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_fat_fsload(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -53,7 +49,8 @@ U_BOOT_CMD(
        "      be printed and performance will suffer for the load."
 );
 
-static int do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_fat_ls(struct cmd_tbl *cmdtp, int flag, int argc,
+                    char *const argv[])
 {
        return do_ls(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -65,12 +62,12 @@ U_BOOT_CMD(
        "    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
-static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc,
-                        char * const argv[])
+static int do_fat_fsinfo(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        int dev, part;
        struct blk_desc *dev_desc;
-       disk_partition_t info;
+       struct disk_partition info;
 
        if (argc < 2) {
                printf("usage: fatinfo <interface> [<dev[:part]>]\n");
@@ -98,15 +95,16 @@ U_BOOT_CMD(
 );
 
 #ifdef CONFIG_FAT_WRITE
-static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
-               int argc, char * const argv[])
+static int do_fat_fswrite(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
        loff_t size;
        int ret;
        unsigned long addr;
        unsigned long count;
+       long offset;
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
        int dev = 0;
        int part = 1;
        void *buf;
@@ -127,9 +125,11 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
        }
        addr = simple_strtoul(argv[3], 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 +143,36 @@ 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(struct cmd_tbl *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(struct cmd_tbl *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