summaryrefslogtreecommitdiff
path: root/board/freescale
diff options
context:
space:
mode:
authorHan Xu <han.xu@nxp.com>2016-05-18 14:44:31 -0500
committerYe Li <ye.li@nxp.com>2016-05-23 17:23:22 +0800
commitc1c4fabdc091a918e2217fd95e25c1ff2808742b (patch)
treed698cc4bd7ad985fc58c60253afdf9536c60dec8 /board/freescale
parent68fbb20f0db35e533488fd3b1c8ace8c880b2212 (diff)
downloadu-boot-imx-c1c4fabdc091a918e2217fd95e25c1ff2808742b.zip
u-boot-imx-c1c4fabdc091a918e2217fd95e25c1ff2808742b.tar.gz
u-boot-imx-c1c4fabdc091a918e2217fd95e25c1ff2808742b.tar.bz2
MLK-12815: mx6ul_14x14_evk: add new NAND config for i.MX6UL 14x14 EVK board
add new NAND config for i.MX6UL 14x14 EVK board, and disable USDHC2 when NAND enabled due to pin conflict. Signed-off-by: Han Xu <han.xu@nxp.com> (cherry picked from commit 81e175bcc07792fab6010761daf6576bd600edda)
Diffstat (limited to 'board/freescale')
-rw-r--r--board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 5e90b52..e00e082 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -532,9 +532,11 @@ int board_mmc_init(bd_t *bis)
imx_iomux_v3_setup_multiple_pads(
usdhc2_emmc_pads, ARRAY_SIZE(usdhc2_emmc_pads));
#else
+#ifndef CONFIG_SYS_USE_NAND
imx_iomux_v3_setup_multiple_pads(
usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
#endif
+#endif
gpio_direction_output(USDHC2_PWR_GPIO, 0);
udelay(500);
gpio_direction_output(USDHC2_PWR_GPIO, 1);