summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/qfw.c6
-rw-r--r--doc/usage/qfw.rst2
2 files changed, 2 insertions, 6 deletions
diff --git a/cmd/qfw.c b/cmd/qfw.c
index eb6a552f6f..d58615040c 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -121,11 +121,7 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
env = env_get("loadaddr");
load_addr = env ?
(void *)hextoul(env, NULL) :
-#ifdef CONFIG_LOADADDR
- (void *)CONFIG_LOADADDR;
-#else
- NULL;
-#endif
+ (void *)CONFIG_SYS_LOAD_ADDR;
env = env_get("ramdiskaddr");
initrd_addr = env ?
diff --git a/doc/usage/qfw.rst b/doc/usage/qfw.rst
index 87463e1e5b..b3704b92d6 100644
--- a/doc/usage/qfw.rst
+++ b/doc/usage/qfw.rst
@@ -26,7 +26,7 @@ The *qfw load* command is used to load a kernel and an initial RAM disk.
kernel_addr
address to which the file specified by the -kernel parameter of QEMU shall
be loaded. Defaults to environment variable *loadaddr* and further to
- the value of *CONFIG_LOADADDR*.
+ the value of *CONFIG_SYS_LOAD_ADDR*.
initrd_addr
address to which the file specified by the -initrd parameter of QEMU shall