Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / x86-common.h

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 65a1e63..c1c5a09 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -25,11 +25,11 @@
  */
 
 /* Default environment */
-#define CONFIG_RAMDISK_ADDR    0x4000000
+#define CFG_RAMDISK_ADDR       0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
-#define CONFIG_OTHBOOTARGS     "othbootargs=\0"
+#define CFG_OTHBOOTARGS        "othbootargs=\0"
 #else
-#define CONFIG_OTHBOOTARGS     "othbootargs=acpi=off\0"
+#define CFG_OTHBOOTARGS        "othbootargs=acpi=off\0"
 #endif
 
 #if defined(CONFIG_DISTRO_DEFAULTS)
@@ -44,12 +44,12 @@
 
 #define CFG_EXTRA_ENV_SETTINGS                 \
        DISTRO_BOOTENV                                  \
-       CONFIG_STD_DEVICES_SETTINGS                     \
+       CFG_STD_DEVICES_SETTINGS                        \
        SPLASH_SETTINGS                                 \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \
        "consoledev=ttyS0\0"                            \
-       CONFIG_OTHBOOTARGS                              \
+       CFG_OTHBOOTARGS                         \
        "scriptaddr=0x7000000\0"                        \
        "kernel_addr_r=0x1000000\0"                     \
        "ramdisk_addr_r=0x4000000\0"                    \