diff options
| author | Ye Li <ye.li@nxp.com> | 2017-03-08 21:53:08 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:06:24 +0800 |
| commit | e4f53022a8b0c911144fa8ec43a13da5641016fc (patch) | |
| tree | 430604799966144746add3517601046144aa6c9a /include/configs/mx6ul_14x14_lpddr2_arm2.h | |
| parent | 1900d5328722777b1ca0d2222031a9a7355ec5e4 (diff) | |
| download | u-boot-imx-e4f53022a8b0c911144fa8ec43a13da5641016fc.zip u-boot-imx-e4f53022a8b0c911144fa8ec43a13da5641016fc.tar.gz u-boot-imx-e4f53022a8b0c911144fa8ec43a13da5641016fc.tar.bz2 | |
MLK-14382-3 mx6ularm2: Convert to enable OF_CONTROL and DM drivers
Update mx6ul ddr3 arm2 and lpddr2 arm2 boards codes and build configurations
to enable OF_CONTROL and DM drivers.
1. Update QSPI settings and codes for DM QSPI driver.
2. Update GPIO codes for adding gpio request
3. Enable FEC DM driver and update relevant configurations
4. Enable USB DM driver
5. Update PMIC and LDO by-pass codes for DM PMIC
6. Add various boot media support, QSPI/NAND/SPINOR/EIMNOR
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include/configs/mx6ul_14x14_lpddr2_arm2.h')
| -rw-r--r-- | include/configs/mx6ul_14x14_lpddr2_arm2.h | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/include/configs/mx6ul_14x14_lpddr2_arm2.h b/include/configs/mx6ul_14x14_lpddr2_arm2.h index d0d74c5..c932eb2 100644 --- a/include/configs/mx6ul_14x14_lpddr2_arm2.h +++ b/include/configs/mx6ul_14x14_lpddr2_arm2.h @@ -8,27 +8,22 @@ #ifndef __MX6UL_14X14_LPDDR2_ARM2_CONFIG_H #define __MX6UL_14X14_LPDDR2_ARM2_CONFIG_H -#define CONFIG_DEFAULT_FDT_FILE "imx6ul-14x14-lpddr2-arm2.dtb" - -#ifdef CONFIG_SYS_BOOT_QSPI -#define CONFIG_SYS_USE_QSPI +#ifdef CONFIG_QSPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH -#elif defined CONFIG_SYS_BOOT_SPINOR -#define CONFIG_SYS_USE_SPINOR +#elif defined CONFIG_SPI_BOOT +#define CONFIG_MXC_SPI #define CONFIG_ENV_IS_IN_SPI_FLASH -#elif defined CONFIG_SYS_BOOT_EIMNOR -#define CONFIG_SYS_USE_EIMNOR +#elif defined(CONFIG_NOR_BOOT) +#define CONFIG_MTD_NOR_FLASH #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_SYS_FLASH_PROTECTION -#elif defined CONFIG_SYS_BOOT_NAND -#define CONFIG_SYS_USE_NAND +#elif defined CONFIG_NAND_BOOT +#define CONFIG_CMD_NAND #define CONFIG_ENV_IS_IN_NAND #else #define CONFIG_ENV_IS_IN_MMC #endif - -#define CONFIG_VIDEO -#ifdef CONFIG_SYS_BOOT_EIMNOR +#ifdef CONFIG_MTD_NOR_FLASH /* * Conflicts with SD1/SD2/VIDEO/ENET * ENET is keeped, since only RXER conflicts. @@ -45,20 +40,14 @@ #define PHYS_SDRAM_SIZE SZ_256M -#ifdef CONFIG_SYS_USE_SPINOR -#define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_MXC_SPI +#ifdef CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) #define CONFIG_SF_DEFAULT_CS 0 #endif -#ifdef CONFIG_CMD_NET -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP +#ifdef CONFIG_DM_ETH #define CONFIG_CMD_MII #define CONFIG_FEC_MXC #define CONFIG_MII @@ -68,15 +57,17 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE MII100 +#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 #endif |