efi_loader: fix 'efidebug bootorder'

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

diff --git a/cmd/qfw.c b/cmd/qfw.c
index 37f1aa6fc7bd8ac862e1e53b2538e287651d07fd..af826627a217c6361b0bfed0763b596fbf98cf32 100644 (file)
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -1,13 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <errno.h>
-#include <qemu_fw_cfg.h>
+#include <qfw.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
@@ -55,7 +55,7 @@ static int qemu_fwcfg_setup_kernel(void *load_addr, void *initrd_addr)
                 * when invoking qemu), do not update bootargs
                 */
                if (*data_addr != '\0') {
-                       if (setenv("bootargs", data_addr) < 0)
+                       if (env_set("bootargs", data_addr) < 0)
                                printf("warning: unable to change bootargs\n");
                }
        }
@@ -123,15 +123,23 @@ static int qemu_fwcfg_do_load(cmd_tbl_t *cmdtp, int flag,
        void *load_addr;
        void *initrd_addr;
 
-       env = getenv("loadaddr");
+       env = env_get("loadaddr");
        load_addr = env ?
                (void *)simple_strtoul(env, NULL, 16) :
+#ifdef CONFIG_LOADADDR
                (void *)CONFIG_LOADADDR;
+#else
+               NULL;
+#endif
 
-       env = getenv("ramdiskaddr");
+       env = env_get("ramdiskaddr");
        initrd_addr = env ?
                (void *)simple_strtoul(env, NULL, 16) :
+#ifdef CONFIG_RAMDISK_ADDR
                (void *)CONFIG_RAMDISK_ADDR;
+#else
+               NULL;
+#endif
 
        if (argc == 2) {
                load_addr = (void *)simple_strtoul(argv[0], NULL, 16);
@@ -140,6 +148,11 @@ static int qemu_fwcfg_do_load(cmd_tbl_t *cmdtp, int flag,
                load_addr = (void *)simple_strtoul(argv[0], NULL, 16);
        }
 
+       if (!load_addr || !initrd_addr) {
+               printf("missing load or initrd address\n");
+               return CMD_RET_FAILURE;
+       }
+
        return qemu_fwcfg_setup_kernel(load_addr, initrd_addr);
 }