diff options
| author | Peng Fan <peng.fan@nxp.com> | 2016-02-23 14:03:16 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2016-03-25 14:23:10 +0800 |
| commit | e8777e91a239599ffd231ef56c60d49b68e5e3fc (patch) | |
| tree | 6b66b0cba3aa687eefb532c26a9c8bde39612e8b | |
| parent | 41a6f612f6ae638ac6db61c60e19dcfebf052820 (diff) | |
| download | u-boot-imx-e8777e91a239599ffd231ef56c60d49b68e5e3fc.zip u-boot-imx-e8777e91a239599ffd231ef56c60d49b68e5e3fc.tar.gz u-boot-imx-e8777e91a239599ffd231ef56c60d49b68e5e3fc.tar.bz2 | |
MLK-12436-1: mx6qarm2: support lpddr2 board
Support lpddr2 board.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | board/freescale/mx6qarm2/mx6qarm2.c | 9 | ||||
| -rw-r--r-- | configs/mx6qarm2_pop_lpddr2_defconfig | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c index 8563836..0e37180 100644 --- a/board/freescale/mx6qarm2/mx6qarm2.c +++ b/board/freescale/mx6qarm2/mx6qarm2.c @@ -60,7 +60,11 @@ iomux_v3_cfg_t const usdhc3_pads[] = { MX6_PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), +#ifdef CONFIG_MX6DQ_POP_LPDDR2 + MX6_PAD_GPIO_18__SD3_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL), +#else MX6_PAD_NANDF_CS0__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */ +#endif }; iomux_v3_cfg_t const usdhc4_pads[] = { @@ -123,15 +127,16 @@ int mmc_map_to_kernel_blk(int devno) int board_mmc_getcd(struct mmc *mmc) { + int ret = 1; +#ifndef CONFIG_MX6DQ_POP_LPDDR2 struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret; if (cfg->esdhc_base == USDHC3_BASE_ADDR) { gpio_direction_input(IMX_GPIO_NR(6, 11)); ret = !gpio_get_value(IMX_GPIO_NR(6, 11)); } else /* Don't have the CD GPIO pin on board */ ret = 1; - +#endif return ret; } diff --git a/configs/mx6qarm2_pop_lpddr2_defconfig b/configs/mx6qarm2_pop_lpddr2_defconfig new file mode 100644 index 0000000..301668a --- /dev/null +++ b/configs/mx6qarm2_pop_lpddr2_defconfig @@ -0,0 +1,5 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_MX6QARM2=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_POP_LPDDR2,DDR_MB=256" +CONFIG_CMD_GPIO=y |