Merge git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	include/configs/imx6qdl_icore_rqs.h
	include/configs/imx6ul_geam.h
	include/configs/imx6ul_isiot.h
This commit is contained in:
Tom Rini
2017-06-27 09:32:37 -04:00
42 changed files with 919 additions and 657 deletions

View File

@@ -2498,7 +2498,6 @@ CONFIG_SPL_NAND_ECC
CONFIG_SPL_NAND_INIT
CONFIG_SPL_NAND_LOAD
CONFIG_SPL_NAND_MINIMAL
CONFIG_SPL_NAND_MXS
CONFIG_SPL_NAND_RAW_ONLY
CONFIG_SPL_NAND_SIMPLE
CONFIG_SPL_NAND_SOFTECC