[PoC 162/241] global: Migrate CONFIG_RAMDISK_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 cmd/qfw.c                    | 4 ++--
 doc/usage/cmd/qfw.rst        | 2 +-
 include/configs/x86-common.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/qfw.c b/cmd/qfw.c
index 95ddc4b79ec7..0c49c6074e16 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 b3704b92d6d9..cc0e27c27790 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 df75deedf583..e8bd2e507041 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -43,7 +43,7 @@
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CFG_HOSTNAME		"x86"
-#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
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index df6a95c2572b..e706fba5e8fd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -171,7 +171,7 @@ CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
-CONFIG_RAMDISK_ADDR
+CFG_RAMDISK_ADDR
 CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
-- 
2.25.1