arm: socfpga: Remove unused passing parameter of socfpga_bridges_reset

[u-boot] / cmd / qfw.c

diff --git a/cmd/qfw.c b/cmd/qfw.c
index 37f1aa6fc7bd8ac862e1e53b2538e287651d07fd..12436ec9b4efcba1884a01c27894a65bc716c40d 100644 (file)
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -7,7 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <errno.h>
-#include <qemu_fw_cfg.h>
+#include <qfw.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
@@ -126,12 +126,20 @@ static int qemu_fwcfg_do_load(cmd_tbl_t *cmdtp, int flag,
        env = getenv("loadaddr");
        load_addr = env ?
                (void *)simple_strtoul(env, NULL, 16) :
+#ifdef CONFIG_LOADADDR
                (void *)CONFIG_LOADADDR;
+#else
+               NULL;
+#endif
 
        env = getenv("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);
 }