git.librecmc.org Git - oweals/u-boot.git/commit

author	Jagan Teki <jagan@amarulasolutions.com>
	Thu, 28 Sep 2017 17:59:13 +0000 (23:29 +0530)
committer	Stefano Babic <sbabic@denx.de>
	Thu, 12 Oct 2017 15:31:16 +0000 (17:31 +0200)
commit	913bdd65d39b8d2773ed0997e4bace5723d3ff73
tree	35b4e5f2e73f026ffbad96ad50ec4152f3022667	tree \| snapshot
parent	fadcf4811aebb552755fd7be94fa08f2220ed676	commit \| 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>

configs/imx6qdl_icore_mmc_defconfig		diff \| blob \| history
configs/imx6qdl_icore_rqs_defconfig		diff \| blob \| history