From 2f45b3041e8431f3e2007d521a570daa4cb95a8e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 23 Aug 2021 10:25:29 -0400 Subject: [PATCH] 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 Signed-off-by: Tom Rini Reviewed-by: Bin Meng --- cmd/qfw.c | 6 +----- doc/usage/qfw.rst | 2 +- 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 -- 2.39.5