projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efi_loader: remove superfluous check in efi_setup_loaded_image()
[oweals/u-boot.git]
/
cmd
/
zfs.c
diff --git
a/cmd/zfs.c
b/cmd/zfs.c
index 3ed9912d19bd4d43a310233ff87e30a24917fcf9..384ac4c9396cc288c5169aaac2210f49321849fd 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,8
+6,6
@@
*
* 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 <common.h>
@@
-51,10
+50,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
@@
-115,7
+114,7
@@
static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
load_addr = addr;
printf("%llu bytes read\n", zfile.size);
load_addr = addr;
printf("%llu bytes read\n", zfile.size);
-
setenv
_hex("filesize", zfile.size);
+
env_set
_hex("filesize", zfile.size);
return 0;
}
return 0;
}