mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-26 22:52:18 +00:00
af8d1d3f71
This patch fixes the following compile warnings: cmd_zfs.c:177:1: warning: initialization from incompatible pointer type [enabled by default] cmd_zfs.c:177:1: warning: (near initialization for '_u_boot_list_cmd_zfsls.cmd') [enabled by default] cmd_zfs.c:182:1: warning: initialization from incompatible pointer type [enabled by default] cmd_zfs.c:182:1: warning: (near initialization for '_u_boot_list_cmd_zfsload.cmd') [enabled by default] Signed-off-by: Stefan Roese <sr@denx.de> Cc: Jorgen Lundman <lundman@lundman.net>
186 lines
4.3 KiB
C
186 lines
4.3 KiB
C
/*
|
|
*
|
|
* ZFS filesystem porting to Uboot by
|
|
* Jorgen Lundman <lundman at lundman.net>
|
|
*
|
|
* zfsfs support
|
|
* made from existing GRUB Sources by Sun, GNU and others.
|
|
*
|
|
* 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
|
|
*
|
|
*/
|
|
|
|
#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);
|
|
sprintf(buf, "%llX", zfile.size);
|
|
setenv("filesize", buf);
|
|
|
|
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");
|