GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-27 09:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

qfw: Switch to CONFIG_SYS_LOAD_ADDR from CONFIG_LOADADDR

Browse source 
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>
This commit is contained in:
Tom Rini 2021-08-23 10:25:29 -04:00
parent 9582af1afa
commit 2f45b3041e
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/qfw.c
View file

@ -121,11 +121,7 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
env = env_get("loadaddr"); env = env_get("loadaddr");
load_addr = env ? load_addr = env ?
(void *)hextoul(env, NULL) : (void *)hextoul(env, NULL) :
#ifdef CONFIG_LOADADDR (void *)CONFIG_SYS_LOAD_ADDR;
(void *)CONFIG_LOADADDR;
#else
NULL;
#endif
env = env_get("ramdiskaddr"); env = env_get("ramdiskaddr");
initrd_addr = env ? initrd_addr = env ?

2
doc/usage/qfw.rst
View file

@ -26,7 +26,7 @@ The *qfw load* command is used to load a kernel and an initial RAM disk.
kernel_addr kernel_addr
address to which the file specified by the -kernel parameter of QEMU shall address to which the file specified by the -kernel parameter of QEMU shall
be loaded. Defaults to environment variable *loadaddr* and further to be loaded. Defaults to environment variable *loadaddr* and further to
the value of *CONFIG_LOADADDR*. the value of *CONFIG_SYS_LOAD_ADDR*.
initrd_addr initrd_addr
address to which the file specified by the -initrd parameter of QEMU shall address to which the file specified by the -initrd parameter of QEMU shall