Merge branch 'master' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 23 Jul 2018 14:51:13 +0000 (10:51 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 23 Jul 2018 17:37:42 +0000 (13:37 -0400)
commitf0306a145b3234ae4bd3b46f2567b6f1ad7b8f4f
treebc633e8be8d1a34cd472e42d59e415e71fe1477a
parent9c5b00973bceb7c0192bd6b03672d69b092700b4
parentf97f167107b33fc6596561dae1309571ade39055
Merge branch 'master' of git://git.denx.de/u-boot-imx

trini: Update colibri-imx6ull to use Kconfig for mtdparts related
options.

Signed-off-by: Tom Rini <trini@konsulko.com>
configs/colibri-imx6ull_defconfig
configs/imx6q_logic_defconfig
include/configs/colibri-imx6ull.h
include/configs/imx6_logic.h