summaryrefslogtreecommitdiff
path: root/common/cmd_zfs.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-18 03:53:51 (GMT)
committerTom Rini <trini@konsulko.com>2016-01-25 15:39:43 (GMT)
commit72a8cf8dccf6f8b86d1683205e032a94eaa86938 (patch)
treeb29378eb8af182f0faf2028cb52465a021de40cc /common/cmd_zfs.c
parent25d5352c71dcc599030a4a764d8087185ed537d3 (diff)
downloadu-boot-fsl-qoriq-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.xz
Move all command code into its own directory
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical. Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command. Unfortunately, with m68k I get this error: m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
Diffstat (limited to 'common/cmd_zfs.c')
-rw-r--r--common/cmd_zfs.c171
1 files changed, 0 insertions, 171 deletions
diff --git a/common/cmd_zfs.c b/common/cmd_zfs.c
deleted file mode 100644
index 0aed29e..0000000
--- a/common/cmd_zfs.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *
- * ZFS filesystem porting to Uboot by
- * Jorgen Lundman <lundman at lundman.net>
- *
- * zfsfs support
- * made from existing GRUB Sources by Sun, GNU and others.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <part.h>
-#include <config.h>
-#include <command.h>
-#include <image.h>
-#include <linux/ctype.h>
-#include <asm/byteorder.h>
-#include <zfs_common.h>
-#include <linux/stat.h>
-#include <malloc.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
-
-#define DOS_PART_MAGIC_OFFSET 0x1fe
-#define DOS_FS_TYPE_OFFSET 0x36
-#define DOS_FS32_TYPE_OFFSET 0x52
-
-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- char *filename = NULL;
- int dev;
- int part;
- ulong addr = 0;
- disk_partition_t info;
- block_dev_desc_t *dev_desc;
- char buf[12];
- unsigned long count;
- const char *addr_str;
- struct zfs_file zfile;
- struct device_s vdev;
-
- if (argc < 3)
- return CMD_RET_USAGE;
-
- count = 0;
- addr = simple_strtoul(argv[3], NULL, 16);
- filename = getenv("bootfile");
- switch (argc) {
- case 3:
- addr_str = getenv("loadaddr");
- if (addr_str != NULL)
- addr = simple_strtoul(addr_str, NULL, 16);
- else
- addr = CONFIG_SYS_LOAD_ADDR;
-
- break;
- case 4:
- break;
- case 5:
- filename = argv[4];
- break;
- case 6:
- filename = argv[4];
- count = simple_strtoul(argv[5], NULL, 16);
- break;
-
- default:
- return cmd_usage(cmdtp);
- }
-
- if (!filename) {
- puts("** No boot file defined **\n");
- return 1;
- }
-
- part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
- if (part < 0)
- return 1;
-
- dev = dev_desc->dev;
- printf("Loading file \"%s\" from %s device %d%c%c\n",
- filename, argv[1], dev,
- part ? ':' : ' ', part ? part + '0' : ' ');
-
- zfs_set_blk_dev(dev_desc, &info);
- vdev.part_length = info.size;
-
- memset(&zfile, 0, sizeof(zfile));
- zfile.device = &vdev;
- if (zfs_open(&zfile, filename)) {
- printf("** File not found %s **\n", filename);
- return 1;
- }
-
- if ((count < zfile.size) && (count != 0))
- zfile.size = (uint64_t)count;
-
- if (zfs_read(&zfile, (char *)addr, zfile.size) != zfile.size) {
- printf("** Unable to read \"%s\" from %s %d:%d **\n",
- filename, argv[1], dev, part);
- zfs_close(&zfile);
- return 1;
- }
-
- zfs_close(&zfile);
-
- /* Loading ok, update default load address */
- load_addr = addr;
-
- printf("%llu bytes read\n", zfile.size);
- setenv_hex("filesize", zfile.size);
-
- return 0;
-}
-
-
-int zfs_print(const char *entry, const struct zfs_dirhook_info *data)
-{
- printf("%s %s\n",
- data->dir ? "<DIR> " : " ",
- entry);
- return 0; /* 0 continue, 1 stop */
-}
-
-
-
-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- const char *filename = "/";
- int part;
- block_dev_desc_t *dev_desc;
- disk_partition_t info;
- struct device_s vdev;
-
- if (argc < 2)
- return cmd_usage(cmdtp);
-
- if (argc == 4)
- filename = argv[3];
-
- part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
- if (part < 0)
- return 1;
-
- zfs_set_blk_dev(dev_desc, &info);
- vdev.part_length = info.size;
-
- zfs_ls(&vdev, filename,
- zfs_print);
-
- return 0;
-}
-
-
-U_BOOT_CMD(zfsls, 4, 1, do_zfs_ls,
- "list files in a directory (default /)",
- "<interface> <dev[:part]> [directory]\n"
- " - list files from 'dev' on 'interface' in a '/DATASET/@/$dir/'");
-
-U_BOOT_CMD(zfsload, 6, 0, do_zfs_load,
- "load binary file from a ZFS filesystem",
- "<interface> <dev[:part]> [addr] [filename] [bytes]\n"
- " - load binary file '/DATASET/@/$dir/$file' from 'dev' on 'interface'\n"
- " to address 'addr' from ZFS filesystem");