diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index db067bb..1a049fa 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -54,11 +54,15 @@ /* I2C configs */ #ifdef CONFIG_CMD_I2C -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_SPEED 100000 +#endif + +/* Only use DM I2C driver for 14x14 EVK. Because the PFUZE3000 driver does not support DM */ +#ifndef CONFIG_DM_I2C +#define CONFIG_SYS_I2C /* PMIC only for 9X9 EVK */ #define CONFIG_POWER @@ -219,13 +223,11 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #ifdef CONFIG_QSPI_BOOT -#define CONFIG_FSL_QSPI #define CONFIG_ENV_IS_IN_SPI_FLASH #elif defined CONFIG_NAND_BOOT #define CONFIG_CMD_NAND #define CONFIG_ENV_IS_IN_NAND #else -#define CONFIG_FSL_QSPI #define CONFIG_ENV_IS_IN_MMC #endif @@ -235,10 +237,10 @@ #define CONFIG_CMD_BMODE -#ifndef CONFIG_SYS_DCACHE_OFF -#endif +#define CONFIG_SOFT_SPI #ifdef CONFIG_FSL_QSPI +#define CONFIG_SYS_FSL_QSPI_AHB #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 @@ -280,20 +282,15 @@ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif - /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_MX6 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX -#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 CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif #ifdef CONFIG_CMD_NET +#define CONFIG_CMD_MII #define CONFIG_FEC_MXC #define CONFIG_MII #define CONFIG_FEC_ENET_DEV 1 @@ -302,15 +299,17 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_ETHPRIME "FEC0" #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_ETHPRIME "FEC1" #endif -#define CONFIG_ETHPRIME "FEC" #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL +#define CONFIG_FEC_MXC_MDIO_BASE ENET2_BASE_ADDR #endif #define CONFIG_IMX_THERMAL |