ARM: imx6: clocks: remove function local definitions of mxc_ccm_reg and anatop_regs

[karo-tx-uboot.git] / common / cmd_fat.c

diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index c865d6d8a2a3536e74a35b4812470a9f747fcff5..aae993d2b9a486c7ca1bdc16c10f7c84e9c817b9 100644 (file)
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Richard Jones, rjones@nexus-tech.net
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -29,29 +13,47 @@
 #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>
 
+int do_fat_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       return do_size(cmdtp, flag, argc, argv, FS_TYPE_FAT);
+}
+
+U_BOOT_CMD(
+       fatsize,        4,      0,      do_fat_size,
+       "determine a file's size",
+       "<interface> <dev[:part]> <filename>\n"
+       "    - Find file 'filename' from 'dev' on 'interface'\n"
+       "      and determine its size."
+);
+
 int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_FAT);
+       return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
 
 
 U_BOOT_CMD(
        fatload,        7,      0,      do_fat_fsload,
        "load binary file from a dos filesystem",
-       "<interface> [<dev[:part]>]  <addr> <filename> [bytes [pos]]\n"
+       "<interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]\n"
        "    - Load binary file 'filename' from 'dev' on 'interface'\n"
        "      to address 'addr' from dos filesystem.\n"
        "      'pos' gives the file position to start loading from.\n"
        "      If 'pos' is omitted, 0 is used. 'pos' requires 'bytes'.\n"
        "      'bytes' gives the size to load. If 'bytes' is 0 or omitted,\n"
-       "      the load stops on end of file."
+       "      the load stops on end of file.\n"
+       "      If either 'pos' or 'bytes' are not aligned to\n"
+       "      ARCH_DMA_MINALIGN then a misaligned buffer warning will\n"
+       "      be printed and performance will suffer for the load."
 );
 
-int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        return do_ls(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -63,7 +65,8 @@ U_BOOT_CMD(
        "    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
-int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+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;
@@ -98,13 +101,15 @@ U_BOOT_CMD(
 static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
                int argc, char * const argv[])
 {
-       long size;
+       loff_t size;
+       int ret;
        unsigned long addr;
        unsigned long count;
        block_dev_desc_t *dev_desc = NULL;
        disk_partition_t info;
        int dev = 0;
        int part = 1;
+       void *buf;
 
        if (argc < 5)
                return cmd_usage(cmdtp);
@@ -123,14 +128,16 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
        addr = simple_strtoul(argv[3], NULL, 16);
        count = simple_strtoul(argv[5], NULL, 16);
 
-       size = file_fat_write(argv[4], (void *)addr, count);
-       if (size == -1) {
+       buf = map_sysmem(addr, count);
+       ret = file_fat_write(argv[4], buf, 0, count, &size);
+       unmap_sysmem(buf);
+       if (ret < 0) {
                printf("\n** Unable to write \"%s\" from %s %d:%d **\n",
                        argv[4], argv[1], dev, part);
                return 1;
        }
 
-       printf("%ld bytes written\n", size);
+       printf("%llu bytes written\n", size);
 
        return 0;
 }