projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
colibri_imx6: fix video stdout in default environment
[oweals/u-boot.git]
/
cmd
/
zfs.c
diff --git
a/cmd/zfs.c
b/cmd/zfs.c
index 0aed29e9b2c8989d86c3ff14fad67feca692b1f8..e429ac88d73c107eb4b6bef68b160d37f4ad92cd 100644
(file)
--- a/
cmd/zfs.c
+++ b/
cmd/zfs.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
*
* ZFS filesystem porting to Uboot by
/*
*
* ZFS filesystem porting to Uboot by
@@
-5,14
+6,13
@@
*
* zfsfs support
* made from existing GRUB Sources by Sun, GNU and others.
*
* 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 <common.h>
#include <part.h>
#include <config.h>
#include <command.h>
+#include <env.h>
#include <image.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <image.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
@@
-24,7
+24,7
@@
#include <usb.h>
#endif
#include <usb.h>
#endif
-#if !
defined(CONFIG_DOS_PARTITION) && !defined(CONFIG_
EFI_PARTITION)
+#if !
CONFIG_IS_ENABLED(DOS_PARTITION) && !CONFIG_IS_ENABLED(
EFI_PARTITION)
#error DOS or EFI partition support must be selected
#endif
#error DOS or EFI partition support must be selected
#endif
@@
-32,15
+32,15
@@
#define DOS_FS_TYPE_OFFSET 0x36
#define DOS_FS32_TYPE_OFFSET 0x52
#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[])
+static int do_zfs_load(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
char *filename = NULL;
int dev;
int part;
ulong addr = 0;
{
char *filename = NULL;
int dev;
int part;
ulong addr = 0;
- disk_partition_t info;
- block_dev_desc_t *dev_desc;
- char buf[12];
+ struct disk_partition info;
+ struct blk_desc *dev_desc;
unsigned long count;
const char *addr_str;
struct zfs_file zfile;
unsigned long count;
const char *addr_str;
struct zfs_file zfile;
@@
-51,10
+51,10
@@
static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
count = 0;
addr = simple_strtoul(argv[3], NULL, 16);
count = 0;
addr = simple_strtoul(argv[3], NULL, 16);
- filename =
getenv
("bootfile");
+ filename =
env_get
("bootfile");
switch (argc) {
case 3:
switch (argc) {
case 3:
- addr_str =
getenv
("loadaddr");
+ addr_str =
env_get
("loadaddr");
if (addr_str != NULL)
addr = simple_strtoul(addr_str, NULL, 16);
else
if (addr_str != NULL)
addr = simple_strtoul(addr_str, NULL, 16);
else
@@
-80,11
+80,11
@@
static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
return 1;
}
return 1;
}
- part =
get_device_and_partition
(argv[1], argv[2], &dev_desc, &info, 1);
+ part =
blk_get_device_part_str
(argv[1], argv[2], &dev_desc, &info, 1);
if (part < 0)
return 1;
if (part < 0)
return 1;
- dev = dev_desc->dev;
+ dev = dev_desc->dev
num
;
printf("Loading file \"%s\" from %s device %d%c%c\n",
filename, argv[1], dev,
part ? ':' : ' ', part ? part + '0' : ' ');
printf("Loading file \"%s\" from %s device %d%c%c\n",
filename, argv[1], dev,
part ? ':' : ' ', part ? part + '0' : ' ');
@@
-112,10
+112,10
@@
static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
zfs_close(&zfile);
/* Loading ok, update default load address */
zfs_close(&zfile);
/* Loading ok, update default load address */
- load_addr = addr;
+
image_
load_addr = addr;
printf("%llu bytes read\n", zfile.size);
printf("%llu bytes read\n", zfile.size);
-
setenv
_hex("filesize", zfile.size);
+
env_set
_hex("filesize", zfile.size);
return 0;
}
return 0;
}
@@
-130,13
+130,13
@@
int zfs_print(const char *entry, const struct zfs_dirhook_info *data)
}
}
-
-
static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+static int do_zfs_ls(struct cmd_tbl *cmdtp, int flag, int argc,
+
char *
const argv[])
{
const char *filename = "/";
int part;
{
const char *filename = "/";
int part;
-
block_dev_desc_t
*dev_desc;
-
disk_partition_t
info;
+
struct blk_desc
*dev_desc;
+
struct disk_partition
info;
struct device_s vdev;
if (argc < 2)
struct device_s vdev;
if (argc < 2)
@@
-145,7
+145,7
@@
static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (argc == 4)
filename = argv[3];
if (argc == 4)
filename = argv[3];
- part =
get_device_and_partition
(argv[1], argv[2], &dev_desc, &info, 1);
+ part =
blk_get_device_part_str
(argv[1], argv[2], &dev_desc, &info, 1);
if (part < 0)
return 1;
if (part < 0)
return 1;