X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=cmd%2Fcramfs.c;h=598028cfadbdedbae33933a2387da55a87818f69;hb=040b2583c3a87c83606b3df64ea653ccaf3aea62;hp=49ee36c74aec81cbdb512d0e46526ba7cce380e0;hpb=59e12a4a8c219c4a334a2c2023edd1aa20f82a9e;p=u-boot diff --git a/cmd/cramfs.c b/cmd/cramfs.c index 49ee36c74a..598028cfad 100644 --- a/cmd/cramfs.c +++ b/cmd/cramfs.c @@ -1,5 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * SPDX-License-Identifier: GPL-2.0+ * * based on: cmd_jffs2.c * @@ -104,7 +104,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct mtdids id; ulong addr; - addr = simple_strtoul(getenv("cramfsaddr"), NULL, 16); + addr = simple_strtoul(env_get("cramfsaddr"), NULL, 16); /* hack! */ /* cramfs_* only supports NOR flash chips */ @@ -117,9 +117,9 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) part.offset = (u64)(uintptr_t) map_sysmem(addr - OFFSET_ADJUSTMENT, 0); /* pre-set Boot file name */ - if ((filename = getenv("bootfile")) == NULL) { + filename = env_get("bootfile"); + if (!filename) filename = "uImage"; - } if (argc == 2) { filename = argv[1]; @@ -138,7 +138,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (size > 0) { printf("### CRAMFS load complete: %d bytes loaded to 0x%lx\n", size, offset); - setenv_hex("filesize", size); + env_set_hex("filesize", size); } else { printf("### CRAMFS LOAD ERROR<%x> for %s!\n", size, filename); } @@ -169,7 +169,7 @@ int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct mtdids id; ulong addr; - addr = simple_strtoul(getenv("cramfsaddr"), NULL, 16); + addr = simple_strtoul(env_get("cramfsaddr"), NULL, 16); /* hack! */ /* cramfs_* only supports NOR flash chips */