summaryrefslogtreecommitdiff
path: root/configs/imx6qdl_icore_rqs_defconfig
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2017-09-28 23:29:13 +0530
committerStefano Babic <sbabic@denx.de>2017-10-12 17:31:16 +0200
commit913bdd65d39b8d2773ed0997e4bace5723d3ff73 (patch)
tree35b4e5f2e73f026ffbad96ad50ec4152f3022667 /configs/imx6qdl_icore_rqs_defconfig
parentfadcf4811aebb552755fd7be94fa08f2220ed676 (diff)
icore: configs: Fix merge conflict issue
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. Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'configs/imx6qdl_icore_rqs_defconfig')
-rw-r--r--configs/imx6qdl_icore_rqs_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig
index 1d02ad095e..fbe96512c6 100644
--- a/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@ -33,7 +33,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