cmd/gpt: avoid NULL check before free()

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

diff --git a/cmd/load.c b/cmd/load.c
index ec3730e0f6c0f37055db7f11fb7a898214c1373a..fab30fe894318a9308bc7cb41e948b9b6d229879 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -11,9 +10,14 @@
 #include <common.h>
 #include <command.h>
 #include <console.h>
+#include <cpu_func.h>
+#include <env.h>
+#include <flash.h>
+#include <image.h>
 #include <s_record.h>
 #include <net.h>
 #include <exports.h>
+#include <serial.h>
 #include <xyzModem.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -50,11 +54,11 @@ static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc,
        load_baudrate = current_baudrate = gd->baudrate;
 #endif
 
-       if (((env_echo = getenv("loads_echo")) != NULL) && (*env_echo == '1')) {
+       env_echo = env_get("loads_echo");
+       if (env_echo && *env_echo == '1')
                do_echo = 1;
-       } else {
+       else
                do_echo = 0;
-       }
 
 #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
        if (argc >= 2) {
@@ -106,7 +110,7 @@ static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc,
                rcode = 1;
        } else {
                printf("## Start Addr      = 0x%08lX\n", addr);
-               load_addr = addr;
+               image_load_addr = addr;
        }
 
 #ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
@@ -427,9 +431,9 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc,
        offset = CONFIG_SYS_LOAD_ADDR;
 
        /* pre-set offset from $loadaddr */
-       if ((s = getenv("loadaddr")) != NULL) {
+       s = env_get("loadaddr");
+       if (s)
                offset = simple_strtoul(s, NULL, 16);
-       }
 
        load_baudrate = current_baudrate = gd->baudrate;
 
@@ -482,12 +486,12 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc,
                addr = load_serial_bin(offset);
 
                if (addr == ~0) {
-                       load_addr = 0;
+                       image_load_addr = 0;
                        printf("## Binary (kermit) download aborted\n");
                        rcode = 1;
                } else {
                        printf("## Start Addr      = 0x%08lX\n", addr);
-                       load_addr = addr;
+                       image_load_addr = addr;
                }
        }
        if (load_baudrate != current_baudrate) {
@@ -978,7 +982,7 @@ static ulong load_serial_ymodem(ulong offset, int mode)
                                rc = flash_write((char *) ymodemBuf,
                                                  store_addr, res);
                                if (rc != 0) {
-                                       flash_perror (rc);
+                                       flash_perror(rc);
                                        return (~0);
                                }
                        } else