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 5d461e8..c1c5a09 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
@@ -44,7 +44,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS                 \
        DISTRO_BOOTENV                                  \
-       CONFIG_STD_DEVICES_SETTINGS                     \
+       CFG_STD_DEVICES_SETTINGS                        \
        SPLASH_SETTINGS                                 \
        "pciconfighost=1\0"                             \
        "netdev=eth0\0"                                 \