qfw: Switch to CONFIG_SYS_LOAD_ADDR from CONFIG_LOADADDR

All platforms define CONFIG_SYS_LOAD_ADDR, but only some define
CONFIG_LOADADDR.  Very very rarely are these not the same address, and
qemu-ppce500 is one such case.  However, based on reading the history of
the code, this mismatched value was simply a copy-paste from other
PowerPC platforms where it is this unused currently.  Switch the code to
use CONFIG_SYS_LOAD_ADDR and update the documentation.

Cc: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/cmd/qfw.c b/cmd/qfw.c
index eb6a552f6fad745b1591d5f44044fbd744b73821..d58615040c64dc110fd5aac1dcfe46846668d136 100644 (file)
--- 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 87463e1e5bb822f9160739d07f98d81afe8f492b..b3704b92d6d91fa41da3c35e0d399eb44fcef61b 100644 (file)
--- 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