Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'

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

diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index f6d7affa0d48b011999a32bd499cbcff3be8e823..fbe33466fcf05a7b723e38d1aa4dd1a3d5ead9a1 100644 (file)
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -13,13 +13,14 @@
 #include <s_record.h>
 #include <net.h>
 #include <ata.h>
+#include <asm/io.h>
 #include <part.h>
 #include <fat.h>
 #include <fs.h>
 
 int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT, 16);
+       return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
 
 
@@ -35,8 +36,7 @@ U_BOOT_CMD(
        "      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.\n"
-       "      All numeric parameters are assumed to be hex."
+       "      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[])
@@ -94,6 +94,7 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
        disk_partition_t info;
        int dev = 0;
        int part = 1;
+       void *buf;
 
        if (argc < 5)
                return cmd_usage(cmdtp);
@@ -112,7 +113,9 @@ 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);
+       buf = map_sysmem(addr, count);
+       size = file_fat_write(argv[4], buf, count);
+       unmap_sysmem(buf);
        if (size == -1) {
                printf("\n** Unable to write \"%s\" from %s %d:%d **\n",
                        argv[4], argv[1], dev, part);