global: Migrate CONFIG_MXC_UART_BASE to CFG

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

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index a4b12dc..0826e0b 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -16,7 +16,7 @@
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
        "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
 
 /* When booting with FIT specify the node entry containing boot.scr */
@@ -26,8 +26,8 @@
 #define BOOT_SCR_STRING "source ${bootscriptaddr}\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       CONFIG_DFU_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
+       CFG_DFU_ENV_SETTINGS \
        "script=boot.scr\0" \
        "bootscr_fitimage_name=bootscr\0" \
        "script_signed=boot.scr.imx-signed\0" \
@@ -84,9 +84,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 */
 
@@ -95,8 +95,6 @@
 
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
-
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT       300