Merge branch 'master' into next

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

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 7fc3459..78af42d 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -12,23 +12,18 @@
 
 #include "mx6_common.h"
 
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
 /* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_USDHC_NUM       2
+#define CFG_SYS_FSL_ESDHC_ADDR 0
+#define CFG_SYS_FSL_USDHC_NUM  2
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
-#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR    0x08
 
 /* Commands */
 
-#define CONFIG_MXC_UART_BASE   UART2_BASE
+#define CFG_MXC_UART_BASE      UART2_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                               \
+#define CFG_EXTRA_ENV_SETTINGS                                               \
        "board=EL6Q\0"                                                          \
        "cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
        "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
@@ -54,9 +49,9 @@
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* environment organization */