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

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	configs/imx6qdl_icore_mmc_defconfig
	configs/imx6qdl_icore_rqs_defconfig

diff --combined configs/apalis_imx6_defconfig
index 89b6670a4760966083144d6b84935c99a89821f7,8f87f1d34c782cfef8837371321360be38e4d885..ba906c6f3df070aad89484cddc7f6f87b822e047
--- 1/configs/apalis_imx6_defconfig
--- 2/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@@ -9,6 -9,7 +9,6 @@@ CONFIG_SPL_SERIAL_SUPPORT=
  CONFIG_VIDEO=y
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 -CONFIG_ENV_IS_IN_MMC=y
  CONFIG_BOOTDELAY=1
  # CONFIG_CONSOLE_MUX is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
@@@ -16,6 -17,9 +16,9 @@@ CONFIG_BOARD_EARLY_INIT_F=
  CONFIG_SPL=y
  CONFIG_SPL_DMA_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
+ CONFIG_SPL_USB_HOST_SUPPORT=y
+ CONFIG_SPL_USB_GADGET_SUPPORT=y
+ CONFIG_SPL_USB_SDP_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Apalis iMX6 # "
  CONFIG_CMD_BOOTZ=y
@@@ -32,6 -36,7 +35,7 @@@ CONFIG_CMD_GPIO=
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
+ CONFIG_CMD_USB_SDP=y
  CONFIG_CMD_USB_MASS_STORAGE=y
  CONFIG_CMD_DHCP=y
  CONFIG_CMD_MII=y
@@@ -41,7 -46,6 +45,7 @@@ CONFIG_CMD_CACHE=
  CONFIG_CMD_EXT4=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
 +CONFIG_ENV_IS_IN_MMC=y
  CONFIG_PHYLIB=y
  CONFIG_PHY_MICREL=y
  CONFIG_PHY_MICREL_KSZ90X1=y

diff --combined configs/colibri_imx6_defconfig
index 35e881b00961e628941ce360819140585ab937a3,beb74b5ae52e4483dfed1b8e6f66d927238ae980..063738373b50927550f9e433ccd42acf05588949
--- 1/configs/colibri_imx6_defconfig
--- 2/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@@ -9,6 -9,7 +9,6 @@@ CONFIG_SPL_SERIAL_SUPPORT=
  CONFIG_VIDEO=y
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
 -CONFIG_ENV_IS_IN_MMC=y
  CONFIG_BOOTDELAY=1
  # CONFIG_CONSOLE_MUX is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
@@@ -16,6 -17,9 +16,9 @@@ CONFIG_BOARD_EARLY_INIT_F=
  CONFIG_SPL=y
  CONFIG_SPL_DMA_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
+ CONFIG_SPL_USB_HOST_SUPPORT=y
+ CONFIG_SPL_USB_GADGET_SUPPORT=y
+ CONFIG_SPL_USB_SDP_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Colibri iMX6 # "
  CONFIG_CMD_BOOTZ=y
@@@ -32,6 -36,7 +35,7 @@@ CONFIG_CMD_GPIO=
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
+ CONFIG_CMD_USB_SDP=y
  CONFIG_CMD_USB_MASS_STORAGE=y
  CONFIG_CMD_DHCP=y
  CONFIG_CMD_MII=y
@@@ -41,7 -46,6 +45,7 @@@ CONFIG_CMD_CACHE=
  CONFIG_CMD_EXT4=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
 +CONFIG_ENV_IS_IN_MMC=y
  CONFIG_PHYLIB=y
  CONFIG_PHY_MICREL=y
  CONFIG_USB=y

diff --combined configs/imx6qdl_icore_mmc_defconfig
index 2a0679f6ff26ba3d447aaddf9910defc25966098,4baed1cf37fe49811444b36244c10abf9f3edd2c..5a84c6366e3d09d9ebdb495de0df06b1956d715f
--- 1/configs/imx6qdl_icore_mmc_defconfig
--- 2/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@@ -15,6 -15,7 +15,6 @@@ CONFIG_FIT=
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 -CONFIG_ENV_IS_IN_MMC=y
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_EXT_SUPPORT=y
@@@ -35,8 -36,6 +35,8 @@@ CONFIG_CMD_EXT4_WRITE=
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
 +CONFIG_ENV_IS_IN_MMC=y
 +# CONFIG_BLK is not set
  CONFIG_SYS_I2C_MXC=y
  CONFIG_PHYLIB=y
  CONFIG_PHY_SMSC=y
@@@ -49,3 -48,4 +49,4 @@@ CONFIG_DEBUG_UART_CLOCK=2400000
  CONFIG_MXC_UART=y
  CONFIG_IMX_THERMAL=y
  CONFIG_VIDEO_IPUV3=y
+ CONFIG_SPL_OS_BOOT=y