icore: configs: Fix merge conflict issue

From: Jagan Teki <[email protected]>

Fix for finding mmc devices on i.MX6Q icore boards added in below comment
"icorem6: Fix to find MMC devices"
(sha1: a2b137b38d925df91afef52f5122927de024f81a)

which is reverted in during u-boot-imx merge
" Merge git://git.denx.de/u-boot-imx"
(sha1: 6aee2ab68c362ace5a59f89a63abed82e0bf19e5)

This patch, is recreated to fix merge conflict.

---
 configs/imx6qdl_icore_mmc_defconfig | 1 -
 configs/imx6qdl_icore_rqs_defconfig | 1 -
 2 files changed, 2 deletions(-)

index 1bc9a06..1b001df 100644
@@ -37,7 +37,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
 CONFIG_ENV_IS_IN_MMC=y
-# CONFIG_BLK is not set
 CONFIG_SYS_I2C_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y

index d26a463..a57a992 100644
@@ -34,7 +34,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_LIST="imx6q-icore-rqs imx6dl-icore-rqs"
 CONFIG_ENV_IS_IN_MMC=y
-# CONFIG_BLK is not set
 CONFIG_SYS_I2C_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y

2.7.4

From: Jagan Teki <[email protected]>

Instead of changing mmc devno from dts nodes better to return the detected devno so-that env trigger the same.

---
 board/engicam/icorem6_rqs/icorem6_rqs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

index 2a321dc..0114889 100644
@@ -27,8 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_ENV_IS_IN_MMC
 int board_mmc_get_env_dev(int devno)
 {
-	/* dev 0 for SD/eSD, dev 1 for MMC/eMMC */
-	return (devno == 3) ? 1 : 0;
+	return devno;
 }
 #endif
 

2.7.4