]> code.ossystems Code Review - bsp/u-boot.git/commit
icore: configs: Fix merge conflict issue
authorJagan Teki <jagan@amarulasolutions.com>
Thu, 28 Sep 2017 17:59:13 +0000 (23:29 +0530)
committerOtavio Salvador <otavio@ossystems.com.br>
Mon, 2 Oct 2017 17:31:33 +0000 (14:31 -0300)
commit4a8723b2992bf5557e12aa56d24bd8a5822cc53f
tree8b6c3cb40c745fc2f70ded01141f6dbf7fa42b9a
parent48e0c406040ab366c4a6b125f402d83e23cc31ed
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>
(cherry picked from commit daf3cb1d066d85acf12c04a06f25442479be25a7)
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig