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

diff --cc configs/imx6q_icore_nand_defconfig
index 0000000000000000000000000000000000000000,034e17479e7b8f7497cee68de28171a109c42a90..2a8605922628588450b92ff2c64f92b0ed64d24c
mode 000000,100644..100644
--- /dev/null
--- 2/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@@ -1,0 -1,47 +1,48 @@@
+ CONFIG_ARM=y
+ CONFIG_ARCH_MX6=y
+ CONFIG_SYS_TEXT_BASE=0x17800000
+ CONFIG_SPL_GPIO_SUPPORT=y
+ CONFIG_SPL_LIBCOMMON_SUPPORT=y
+ CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_TARGET_MX6Q_ENGICAM=y
+ CONFIG_SPL_SERIAL_SUPPORT=y
+ CONFIG_SPL_WATCHDOG_SUPPORT=y
+ # CONFIG_CMD_BMODE is not set
+ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
+ CONFIG_FIT=y
+ CONFIG_FIT_SIGNATURE=y
+ CONFIG_FIT_VERBOSE=y
+ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
+ CONFIG_BOOTDELAY=3
++CONFIG_SUPPORT_RAW_INITRD=y
+ CONFIG_SPL=y
+ CONFIG_SPL_DMA_SUPPORT=y
+ CONFIG_HUSH_PARSER=y
+ CONFIG_SYS_PROMPT="icorem6qdl> "
+ CONFIG_CMD_MEMTEST=y
+ CONFIG_CMD_GPIO=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
+ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ENV_IS_IN_NAND=y
+ CONFIG_SYS_I2C_MXC=y
+ CONFIG_NAND=y
+ CONFIG_NAND_MXS=y
+ CONFIG_PHYLIB=y
+ CONFIG_PHY_SMSC=y
+ CONFIG_FEC_MXC=y
+ CONFIG_PINCTRL=y
+ CONFIG_PINCTRL_IMX6=y
+ CONFIG_MXC_UART=y
+ CONFIG_IMX_THERMAL=y
+ CONFIG_VIDEO=y
+ CONFIG_VIDEO_IPUV3=y

diff --cc configs/imx6qdl_icore_mipi_defconfig
index e79f29aeb6c9ccb83d5f55f83a9f2691d3b4b620,e212cd1c189f42d0dfc31108445d8cb74991d871..208fc89b7e55f07ddd9ecd51f80503a9f0fbd349
--- 1/configs/imx6qdl_icore_mipi_defconfig
--- 2/configs/imx6qdl_icore_mipi_defconfig
+++ b/configs/imx6qdl_icore_mipi_defconfig
@@@ -17,9 -17,8 +17,9 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="icorem6qdl-mipi> "

diff --cc configs/imx6qdl_icore_mmc_defconfig
index 3f7075767ba7c6b61f6cbe796aee7450e7a6ad06,1a0ee836337e694f31548a7a968f3d6e814301dc..d386946df609cd8541291e0d6849759aeb5767f4
--- 1/configs/imx6qdl_icore_mmc_defconfig
--- 2/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@@ -17,9 -17,8 +17,9 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="icorem6qdl> "

diff --cc configs/imx6qdl_icore_rqs_defconfig
index 485b9bf02e3b1220a5aae3bb6bd3aba7308bc7bd,98ba9345d584a0aa6198a55af7b01c900a6c7b38..13f345536979a58939e06abcd5a95d6416a09976
--- 1/configs/imx6qdl_icore_rqs_defconfig
--- 2/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@@ -16,9 -16,8 +16,9 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="icorem6qdl-rqs> "

diff --cc configs/imx6ul_geam_mmc_defconfig
index e887327e2110dad61f79a198102b6ba0da9de870,2493c70e535d4f062700fa8ac4499583b3cc898e..b6d8680b0889f21869e737497923699ba94c6140
--- 1/configs/imx6ul_geam_mmc_defconfig
--- 2/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@@ -16,9 -16,7 +16,8 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="geam6ul> "
  CONFIG_CRC32_VERIFY=y

diff --cc configs/imx6ul_isiot_emmc_defconfig
index 35e889283a1c78402fccef9c936951d4aaacad18,6e7de0882aba896a00de7c6bc786d40123353c3e..a9bfbfd254f620975b4537255f432ad5571752c5
--- 1/configs/imx6ul_isiot_emmc_defconfig
--- 2/configs/imx6ul_isiot_emmc_defconfig
+++ b/configs/imx6ul_isiot_emmc_defconfig
@@@ -16,9 -16,7 +16,8 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="isiotmx6ul> "
  CONFIG_CRC32_VERIFY=y

diff --cc configs/mx6sabresd_defconfig
Simple merge