aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-12-04 10:13:39 -0500
committerTom Rini <trini@konsulko.com>2022-12-23 10:15:11 -0500
commitd4c8dd1e6f7ca7740acd20eb3c97e051be94c375 (patch)
treea334345ccfdb29f80737a093f9b8fb788fd75453
parent62350c72d4bb4142e17bc594715456fa472d6b14 (diff)
downloadu-boot-d4c8dd1e6f7ca7740acd20eb3c97e051be94c375.zip
u-boot-d4c8dd1e6f7ca7740acd20eb3c97e051be94c375.tar.gz
u-boot-d4c8dd1e6f7ca7740acd20eb3c97e051be94c375.tar.bz2
global: Migrate CONFIG_RAMDISK_ADDR to CFG
Perform a simple rename of CONFIG_RAMDISK_ADDR to CFG_RAMDISK_ADDR Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--cmd/qfw.c4
-rw-r--r--doc/usage/cmd/qfw.rst2
-rw-r--r--include/configs/x86-common.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/qfw.c b/cmd/qfw.c
index 95ddc4b..0c49c60 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
env = env_get("ramdiskaddr");
initrd_addr = env ?
(void *)hextoul(env, NULL) :
-#ifdef CONFIG_RAMDISK_ADDR
- (void *)CONFIG_RAMDISK_ADDR;
+#ifdef CFG_RAMDISK_ADDR
+ (void *)CFG_RAMDISK_ADDR;
#else
NULL;
#endif
diff --git a/doc/usage/cmd/qfw.rst b/doc/usage/cmd/qfw.rst
index b3704b9..cc0e27c 100644
--- a/doc/usage/cmd/qfw.rst
+++ b/doc/usage/cmd/qfw.rst
@@ -31,7 +31,7 @@ kernel_addr
initrd_addr
address to which the file specified by the -initrd parameter of QEMU shall
be loaded. Defaults to environment variable *ramdiskaddr* and further to
- the value of *CONFIG_RAMDISK_ADDR*.
+ the value of *CFG_RAMDISK_ADDR*.
Examples
--------
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 5d461e8..f421ec5 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -25,7 +25,7 @@
*/
/* Default environment */
-#define CONFIG_RAMDISK_ADDR 0x4000000
+#define CFG_RAMDISK_ADDR 0x4000000
#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
#define CFG_OTHBOOTARGS "othbootargs=\0"
#else