Merge tag 'u-boot-amlogic-20200618' of https://gitlab.denx.de/u-boot/custodians/u...

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

diff --git a/cmd/reiser.c b/cmd/reiser.c
index 9c3e9e9e582be7e19d1dcc8106397867fce6ae66..3db926f806487114ad5c499e94a87009dadfc5ee 100644 (file)
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003 - 2004
  * Sysgo Real-Time Solutions, AG <www.elinos.com>
  * Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -12,6 +11,7 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
+#include <env.h>
 #include <image.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
@@ -30,12 +30,12 @@
 #define PRINTF(fmt,args...)
 #endif
 
-int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_reiserls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        char *filename = "/";
        int dev, part;
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
 
        if (argc < 3)
                return CMD_RET_USAGE;
@@ -76,30 +76,30 @@ U_BOOT_CMD(
 /******************************************************************************
  * Reiserfs boot command intepreter. Derived from diskboot
  */
-int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_reiserload(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        char *filename = NULL;
        int dev, part;
        ulong addr = 0, filelen;
-       disk_partition_t info;
+       struct disk_partition info;
        struct blk_desc *dev_desc = NULL;
        unsigned long count;
        char *addr_str;
 
        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 {
                        addr = CONFIG_SYS_LOAD_ADDR;
                }
-               filename = getenv ("bootfile");
+               filename = env_get("bootfile");
                count = 0;
                break;
        case 4:
                addr = simple_strtoul (argv[3], NULL, 16);
-               filename = getenv ("bootfile");
+               filename = env_get("bootfile");
                count = 0;
                break;
        case 5:
@@ -154,10 +154,10 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 
        /* Loading ok, update default load address */
-       load_addr = addr;
+       image_load_addr = addr;
 
        printf ("\n%ld bytes read\n", filelen);
-       setenv_hex("filesize", filelen);
+       env_set_hex("filesize", filelen);
 
        return filelen;
 }