global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 33eef90..5d2956a 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -14,11 +14,9 @@
 #define PHYS_SDRAM_SIZE                        SZ_512M
 
 /* MMC Config*/
-#define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
+#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 */
@@ -28,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" \
@@ -40,12 +38,12 @@
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "fdt_file=imx7s-warp.dtb\0" \
-       "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \
+       "fdt_addr=0x83000000\0" \
        "fdtovaddr=0x83100000\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "rootpart=" __stringify(CONFIG_WARP7_ROOT_PART) "\0" \
        "finduuid=part uuid mmc 0:${rootpart} uuid\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
@@ -86,42 +84,20 @@
 /* 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 CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-/*
- * Environment starts at CONFIG_ENV_OFFSET= 0xC0000 = 768k = 768*1024 = 786432
- *
- * Detect overlap between U-Boot image and environment area in build-time
- *
- * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset
- * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408
- *
- * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so
- * write the direct value here
- */
-#define CONFIG_BOARD_SIZE_LIMIT                785408
+#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 */
 
-#define CONFIG_SYS_FSL_USDHC_NUM       1
+#define CFG_SYS_FSL_USDHC_NUM  1
 
 
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-
-#define CONFIG_USBD_HS
+#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 
-#define CONFIG_USBNET_DEV_ADDR         "de:ad:be:af:00:01"
-
 /* Environment variable name to represent HAB enable state */
 #define HAB_ENABLED_ENVNAME            "hab_enabled"