Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/common/cmd_ext4.c b/common/cmd_ext4.c
index 4a27cd97c09d0ae1518a7de8050f8bcb9934f7b6..ecfc6d3c9bb077fa523ba6c476be388906862fbc 100644 (file)
--- a/common/cmd_ext4.c
+++ b/common/cmd_ext4.c
@@ -42,10 +42,16 @@
 #include <usb.h>
 #endif
 
+int do_ext4_size(cmd_tbl_t *cmdtp, int flag, int argc,
+                                               char *const argv[])
+{
+       return do_size(cmdtp, flag, argc, argv, FS_TYPE_EXT);
+}
+
 int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc,
                                                char *const argv[])
 {
-       return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
+       return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT);
 }
 
 int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
@@ -79,8 +85,8 @@ int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc,
        /* get the address in hexadecimal format (string to int) */
        ram_address = simple_strtoul(argv[3], NULL, 16);
 
-       /* get the filesize in base 10 format */
-       file_size = simple_strtoul(argv[5], NULL, 10);
+       /* get the filesize in hexadecimal format */
+       file_size = simple_strtoul(argv[5], NULL, 16);
 
        /* set the device as block device */
        ext4fs_set_blk_dev(dev_desc, &info);
@@ -113,6 +119,14 @@ U_BOOT_CMD(ext4write, 6, 1, do_ext4_write,
 
 #endif
 
+U_BOOT_CMD(
+       ext4size,       4,      0,      do_ext4_size,
+       "determine a file's size",
+       "<interface> <dev[:part]> <filename>\n"
+       "    - Find file 'filename' from 'dev' on 'interface'\n"
+       "      and determine its size."
+);
+
 U_BOOT_CMD(ext4ls, 4, 1, do_ext4_ls,
           "list files in a directory (default /)",
           "<interface> <dev[:part]> [directory]\n"
@@ -120,7 +134,6 @@ U_BOOT_CMD(ext4ls, 4, 1, do_ext4_ls,
 
 U_BOOT_CMD(ext4load, 6, 0, do_ext4_load,
           "load binary file from a Ext4 filesystem",
-          "<interface> <dev[:part]> [addr] [filename] [bytes]\n"
+          "<interface> [<dev[:part]> [addr [filename [bytes [pos]]]]]\n"
           "    - load binary file 'filename' from 'dev' on 'interface'\n"
-          "      to address 'addr' from ext4 filesystem.\n"
-          "      All numeric parameters are assumed to be hex.");
+          "      to address 'addr' from ext4 filesystem");