global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 0e43b37..a2aa310 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -10,13 +10,10 @@
 #include "mx6_common.h"
 #include <asm/mach-imx/gpio.h>
 
-/* SPL options */
-#include "imx6_spl.h"
-
-#define CONFIG_MXC_UART_BASE           MX6UL_UART7_BASE_ADDR
+#define CFG_MXC_UART_BASE              MX6UL_UART7_BASE_ADDR
 
 /* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
+#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
 
 /* Miscellaneous configurable options */
 
@@ -24,23 +21,20 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        (128 << 20)
 
-#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 is in stored in the eMMC boot partition */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS           0
-
-#define CONFIG_FEC_ENET_DEV            0
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS              0
 
-#define CONFIG_UBOOT_SECTOR_START      0x2
-#define CONFIG_UBOOT_SECTOR_COUNT      0x3fe
+#define CFG_FEC_ENET_DEV               0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
        "console=ttymxc6\0" \
@@ -78,8 +72,8 @@
                        "bootz; " \
                "fi;\0" \
        "uboot=ccv/u-boot.imx\0"                                        \
-       "uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0"        \
-       "uboot_size="__stringify(CONFIG_UBOOT_SECTOR_COUNT)"\0"         \
+       "uboot_start=0x2\0"                                             \
+       "uboot_size=0x3fe\0"                                            \
        "update_uboot=if tftp ${uboot}; then "                          \
                "if itest ${filesize} > 0; then "                       \
                        "mmc dev 0 1;"                                  \