From: Tom Rini <trini@konsulko.com>
Date: Sun, 4 Dec 2022 15:13:39 +0000 (-0500)
Subject: global: Migrate CONFIG_RAMDISK_ADDR to CFG
X-Git-Tag: v2025.01-rc5-pxa1908~1158^2~5^2~41
X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=d4c8dd1e6f7ca7740acd20eb3c97e051be94c375;p=u-boot.git

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>
---

diff --git a/cmd/qfw.c b/cmd/qfw.c
index 95ddc4b79e..0c49c6074e 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 b3704b92d6..cc0e27c277 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 5d461e8d0c..f421ec5803 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