Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c1c4fabdc091a918e2217fd95e25c1ff2808742b

Authored by Han Xu
Committed by Ye Li
1 parent 68fbb20f0d
Exists in smarc-rel_imx_4.1.15_2.0.0_ga

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)

Showing 2 changed files with 9 additions and 0 deletions Side-by-side Diff

board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
Diff comments   View file @ c1c4fab
... ... @@ -532,8 +532,10 @@
532 532 imx_iomux_v3_setup_multiple_pads(
533 533 usdhc2_emmc_pads, ARRAY_SIZE(usdhc2_emmc_pads));
534 534 #else
  535 +#ifndef CONFIG_SYS_USE_NAND
535 536 imx_iomux_v3_setup_multiple_pads(
536 537 usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
  538 +#endif
537 539 #endif
538 540 gpio_direction_output(USDHC2_PWR_GPIO, 0);
539 541 udelay(500);
configs/mx6ul_14x14_evk_nand_defconfig
Diff comments   View file @ c1c4fab
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_TARGET_MX6UL_14X14_EVK=y
  4 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage.cfg,SYS_BOOT_NAND"
  5 +CONFIG_CMD_GPIO=y
  6 +CONFIG_CMD_DHCP=y
  7 +CONFIG_CMD_PING=y