global: Move remaining CONFIG_SYS_* to CFG_SYS_*

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

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index fcdf7e9..4b31bbf 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -10,23 +10,15 @@
 #include <linux/stringify.h>
 #include "mx6_common.h"
 
-/* SPL options */
-#include "imx6_spl.h"
-
 /* NAND pin conflicts with usdhc2 */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_FSL_USDHC_NUM        1
+#define CFG_SYS_FSL_USDHC_NUM        1
 #else
-#define CONFIG_SYS_FSL_USDHC_NUM        2
+#define CFG_SYS_FSL_USDHC_NUM        2
 #endif
 
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_ENET_DEV            0
-#if (CONFIG_FEC_ENET_DEV == 0)
-#define CONFIG_ETHPRIME                        "eth0"
-#elif (CONFIG_FEC_ENET_DEV == 1)
-#define CONFIG_ETHPRIME                        "eth1"
-#endif
 #endif
 
 /* Environment settings */
@@ -40,7 +32,7 @@
 
 /* MMC Configs */
 
-#define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
+#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
 
 /* I2C configs */
 
@@ -50,20 +42,13 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_512M
 
-#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
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 #define ENV_MMC \
        "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \