sandbox: image: Adjust FIT image printing to work with sandbox

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

diff --git a/common/cmd_ext4.c b/common/cmd_ext4.c
index 3298fee78c18f6410f667f2ef9d9c8c1f8c39e9d..706fd54a553b9fc394a18c3f4add6027838967c0 100644 (file)
--- a/common/cmd_ext4.c
+++ b/common/cmd_ext4.c
@@ -47,50 +47,94 @@
 #include <image.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
-#include <ext_common.h>
 #include <ext4fs.h>
 #include <linux/stat.h>
 #include <malloc.h>
+#include <fs.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
 #endif
 
-#if !defined(CONFIG_DOS_PARTITION) && !defined(CONFIG_EFI_PARTITION)
-#error DOS or EFI partition support must be selected
-#endif
-
-uint64_t total_sector;
-uint64_t part_offset;
-
-#define DOS_PART_MAGIC_OFFSET          0x1fe
-#define DOS_FS_TYPE_OFFSET             0x36
-#define DOS_FS32_TYPE_OFFSET           0x52
-
 int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc,
                                                char *const argv[])
 {
-       if (do_ext_load(cmdtp, flag, argc, argv))
-               return -1;
-
-       return 0;
+       return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
 }
 
 int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
-       if (do_ext_ls(cmdtp, flag, argc, argv))
-               return -1;
+       return do_ls(cmdtp, flag, argc, argv, FS_TYPE_EXT);
+}
+
+#if defined(CONFIG_CMD_EXT4_WRITE)
+int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc,
+                               char *const argv[])
+{
+       const char *filename = "/";
+       int dev, part;
+       unsigned long ram_address;
+       unsigned long file_size;
+       disk_partition_t info;
+       block_dev_desc_t *dev_desc;
+
+       if (argc < 6)
+               return cmd_usage(cmdtp);
+
+       part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
+       if (part < 0)
+               return 1;
+
+       dev = dev_desc->dev;
+
+       /* get the filename */
+       filename = argv[4];
+
+       /* 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);
+
+       /* set the device as block device */
+       ext4fs_set_blk_dev(dev_desc, &info);
+
+       /* mount the filesystem */
+       if (!ext4fs_mount(info.size)) {
+               printf("Bad ext4 partition %s %d:%d\n", argv[1], dev, part);
+               goto fail;
+       }
+
+       /* start write */
+       if (ext4fs_write(filename, (unsigned char *)ram_address, file_size)) {
+               printf("** Error ext4fs_write() **\n");
+               goto fail;
+       }
+       ext4fs_close();
 
        return 0;
+
+fail:
+       ext4fs_close();
+
+       return 1;
 }
 
+U_BOOT_CMD(ext4write, 6, 1, do_ext4_write,
+       "create a file in the root directory",
+       "<interface> <dev[:part]> <addr> <absolute filename path> [sizebytes]\n"
+       "    - create a file in / directory");
+
+#endif
+
 U_BOOT_CMD(ext4ls, 4, 1, do_ext4_ls,
           "list files in a directory (default /)",
           "<interface> <dev[:part]> [directory]\n"
-          "      - list files from 'dev' on 'interface' in a 'directory'");
+          "    - list files from 'dev' on 'interface' in a 'directory'");
 
 U_BOOT_CMD(ext4load, 6, 0, do_ext4_load,
           "load binary file from a Ext4 filesystem",
           "<interface> <dev[:part]> [addr] [filename] [bytes]\n"
-          "      - load binary file 'filename' from 'dev' on 'interface'\n"
-          "             to address 'addr' from ext4 filesystem");
+          "    - load binary file 'filename' from 'dev' on 'interface'\n"
+          "      to address 'addr' from ext4 filesystem.\n"
+          "      All numeric parameters are assumed to be hex.");