git.baikalelectronics.ru Git - uboot.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	aaef9f14edff3e95381a17ee1f16827eb44f9d7c
tree	35b4e5f2e73f026ffbad96ad50ec4152f3022667	tree \| snapshot
parent	3cafa5fa6ae1b4a801a5866f040b0e10c86d0008	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: eef638de72d89ae863b9d358c15536a40f302007)

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

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