summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2017-04-06 17:12:59 +0800
committerYe Li <ye.li@nxp.com>2017-04-06 17:12:59 +0800
commit89f74eb986c4f7b03ca49d442c8527b18dd87bc4 (patch)
treec568b0173d8ac9cc87146333953e0e45f99564fc
parentb932ab6d810c1ff7b945b1ce4fd1ccd7aa4f6878 (diff)
downloadu-boot-imx-89f74eb986c4f7b03ca49d442c8527b18dd87bc4.zip
u-boot-imx-89f74eb986c4f7b03ca49d442c8527b18dd87bc4.tar.gz
u-boot-imx-89f74eb986c4f7b03ca49d442c8527b18dd87bc4.tar.bz2
MLK-14365 nand: replace the CONFIG_SYS_USE_NAND
The CONFIG_SYS_USE_NAND is not used in v2017.03. We have to replace it by other NAND configurations, like CONFIG_CMD_NAND or CONFIG_NAND_MXS. Signed-off-by: Ye Li <ye.li@nxp.com>
-rw-r--r--board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c2
-rw-r--r--board/freescale/mx7d_19x19_lpddr3_arm2/mx7d_19x19_lpddr3_arm2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c b/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
index 9da8155..62cb25d 100644
--- a/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
+++ b/board/freescale/mx6ul_14x14_lpddr2_arm2/mx6ul_14x14_lpddr2_arm2.c
@@ -477,7 +477,7 @@ int board_mmc_init(bd_t *bis)
gpio_request(USDHC1_PWR_GPIO, "usdhc1 pwr");
gpio_direction_output(USDHC1_PWR_GPIO, 1);
break;
-#if !defined(CONFIG_SYS_USE_NAND)
+#if !defined(CONFIG_CMD_NAND)
case 1:
#ifdef CONFIG_MX6UL_LPDDR2_ARM2_USDHC2_REWORK
imx_iomux_v3_setup_multiple_pads(
diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/mx7d_19x19_lpddr3_arm2.c b/board/freescale/mx7d_19x19_lpddr3_arm2/mx7d_19x19_lpddr3_arm2.c
index 927289c..e26a789 100644
--- a/board/freescale/mx7d_19x19_lpddr3_arm2/mx7d_19x19_lpddr3_arm2.c
+++ b/board/freescale/mx7d_19x19_lpddr3_arm2/mx7d_19x19_lpddr3_arm2.c
@@ -493,7 +493,7 @@ int board_init(void)
setup_eimnor();
#endif
-#ifdef CONFIG_SYS_USE_NAND
+#ifdef CONFIG_NAND_MXS
setup_gpmi_nand();
#endif