global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 2d9f8bb..106fbdb 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -10,10 +10,9 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
-#undef CONFIG_SYS_AUTOLOAD
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 /*
  * Use:
@@ -23,7 +22,7 @@
  */
 #define MY_CONFIG_BOOT_MODE    "boot-mode=sd\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        MY_CONFIG_BOOT_MODE \
        "image=zImage\0" \
        "console=ttymxc0\0" \
@@ -70,26 +69,16 @@
 /* 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)
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* MMC Config*/
-#define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC1_BASE_ADDR
-#define CONFIG_SYS_FSL_USDHC_NUM               2
+#define CFG_SYS_FSL_ESDHC_ADDR       USDHC1_BASE_ADDR
+#define CFG_SYS_FSL_USDHC_NUM          2
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-
-#define CONFIG_USBD_HS
-
-/* SPL */
-#include "imx7_spl.h"
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /* __CONFIG_H */