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 95ddc4b79ec7bc22faf452f933f7c60cfd9d5d91..0c49c6074e16ab56ded42f7905d308ae01d8eb9a 100644 (file)
--- 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 b3704b92d6d91fa41da3c35e0d399eb44fcef61b..cc0e27c27790a12df3e68fd2171bd42d537a8c6e 100644 (file)
--- 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 5d461e8d0c6404cb27919fa1d88258c71649631c..f421ec58034459d705acc0827c9bf31d95ef0fe3 100644 (file)
--- 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