Merge branch 'master' into next

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

diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index ad53f17..f2edd13 100644 (file)
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -11,16 +11,15 @@
 /* SPL */
 
 #include "mx6_common.h"
-#include "imx6_spl.h"
 
 #ifdef CONFIG_SERIAL_CONSOLE_UART1
 #if defined(CONFIG_MX6SL)
-#define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART1_IPS_BASE_ADDR
 #else
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 #endif
 #elif defined(CONFIG_SERIAL_CONSOLE_UART2)
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 #else
 #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
 #endif
@@ -28,10 +27,10 @@
 /* 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
 
-#define CONFIG_MXC_USB_PORTSC  PORT_PTS_UTMI
+#define CFG_MXC_USB_PORTSC     PORT_PTS_UTMI
 
 #endif        /* __CONFIG_H */