diff options
| author | Jagan Teki <jagan@amarulasolutions.com> | 2017-09-28 23:29:13 +0530 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-10-12 17:31:16 +0200 |
| commit | 913bdd65d39b8d2773ed0997e4bace5723d3ff73 (patch) | |
| tree | 35b4e5f2e73f026ffbad96ad50ec4152f3022667 /configs/bananapi_m64_defconfig | |
| parent | fadcf4811aebb552755fd7be94fa08f2220ed676 (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/bananapi_m64_defconfig')
0 files changed, 0 insertions, 0 deletions