diff options
| author | Peng Fan <peng.fan@nxp.com> | 2016-02-24 19:50:16 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:40 +0800 |
| commit | 4798ccf62379676c744a58d109eee39efd9d3d62 (patch) | |
| tree | f8697a676f50e7a0d72076ab5d7e47afa4f389ea /include | |
| parent | 80d19b2527b6fa96a0dcf5f9dfe033c62a1a1842 (diff) | |
| download | u-boot-imx-4798ccf62379676c744a58d109eee39efd9d3d62.zip u-boot-imx-4798ccf62379676c744a58d109eee39efd9d3d62.tar.gz u-boot-imx-4798ccf62379676c744a58d109eee39efd9d3d62.tar.bz2 | |
MLK-12436-8: imx: mx6qsabreauto: misc board update
To Align with imx_v2016.03.
1. Add USDHC1 support on mother board
2. Add SPINOR flash support.
3. Add enet ref clk pinmux setting and enet settings
4. Use CONFIG_SYS_USE_EIMNOR to wrap eimnor settings.
5. update mmc board settings
6. update board_init and move nand settings to board_init, but not in
board_early_init_f
7. update pmic settings to align with datasheet.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit f05f2281548ab7b47f69b2c517eb6f85ad09a5d2)
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 171fdb2..96f5a9d 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -12,8 +12,15 @@ #define CONFIG_MACH_TYPE 3529 #define CONFIG_MXC_UART_BASE UART4_BASE #define CONSOLE_DEV "ttymxc3" -#define CONFIG_MMCROOT "/dev/mmcblk0p2" +#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* SDHC3 */ +#define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024) +#ifdef CONFIG_MX6S +#undef PHYS_SDRAM_SIZE +#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) +#endif +/*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */ +#if !defined(CONFIG_SYS_USE_SPINOR) && !defined(CONFIG_SYS_USE_EIMNOR) /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 @@ -26,6 +33,7 @@ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} } +#endif #include "mx6sabre_common.h" @@ -36,6 +44,7 @@ #define MFG_NAND_PARTITION "" #endif +#ifdef CONFIG_SYS_USE_EIMNOR #define CONFIG_MTD_NOR_FLASH #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR #define CONFIG_SYS_FLASH_SECT_SIZE (128 * 1024) @@ -46,12 +55,15 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT +#endif #define CONFIG_SYS_FSL_USDHC_NUM 2 -#if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#endif +#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ +#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ +#ifdef CONFIG_SYS_USE_SPINOR +#define CONFIG_SF_DEFAULT_CS 1 +#endif /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC |