cmd: eeprom: Staticize eeprom_i2c_bus

[oweals/u-boot.git] / cmd / cramfs.c

diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 7b23c5b3dd5538a1ac7a4589d4b4039b6fbcd0fe..ad232deae009c2b323b85f5a185a393da5316adf 100644 (file)
--- 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
  *
@@ -12,6 +12,8 @@
  */
 #include <common.h>
 #include <command.h>
+#include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <linux/list.h>
@@ -96,7 +98,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *filename;
        int size;
-       ulong offset = load_addr;
+       ulong offset = image_load_addr;
        char *offset_virt;
 
        struct part_info part;
@@ -104,7 +106,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,16 +119,16 @@ 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];
        }
        if (argc == 3) {
                offset = simple_strtoul(argv[1], NULL, 0);
-               load_addr = offset;
+               image_load_addr = offset;
                filename = argv[2];
        }
 
@@ -169,7 +171,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 */