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

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

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/hab.c
Simple merge

diff --cc configs/dms-ba16-1g_defconfig
index af23597,8008916..8c1a55f
--- 1/configs/dms-ba16-1g_defconfig
--- 2/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@@ -30,9 -30,9 +30,10 @@@ CONFIG_CMD_FAT=
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_DWC_AHSATA=y
 +CONFIG_FSL_ESDHC=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_STMICRO=y
+ CONFIG_SPI_FLASH_WINBOND=y
  CONFIG_PHYLIB=y
  CONFIG_MXC_SPI=y
  CONFIG_USB=y

diff --cc configs/dms-ba16_defconfig
index 33d44b4,7803052..578cd69
--- 1/configs/dms-ba16_defconfig
--- 2/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@@ -29,9 -29,9 +29,10 @@@ CONFIG_CMD_FAT=
  CONFIG_CMD_FS_GENERIC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_DWC_AHSATA=y
 +CONFIG_FSL_ESDHC=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_STMICRO=y
+ CONFIG_SPI_FLASH_WINBOND=y
  CONFIG_PHYLIB=y
  CONFIG_MXC_SPI=y
  CONFIG_USB=y

diff --cc configs/pico-imx7d_defconfig
index 0124941,b85486d..c355f06
--- 1/configs/pico-imx7d_defconfig
--- 2/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@@ -22,7 -22,7 +22,8 @@@ CONFIG_CMD_EXT2=
  CONFIG_CMD_EXT4=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
 +CONFIG_FSL_ESDHC=y
+ CONFIG_CMD_FS_GENERIC=y
  CONFIG_PHYLIB=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y

diff --cc drivers/i2c/Kconfig
Simple merge

diff --cc include/configs/ge_bx50v3.h
Simple merge

diff --cc include/configs/ls1012a_common.h
index 91e6da0,73cd049..35ecb3c
--- 1/include/configs/ls1012a_common.h
--- 2/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@@ -75,10 -77,8 +75,7 @@@
  
  /* I2C */
  #define CONFIG_SYS_I2C
- #define CONFIG_SYS_I2C_MXC
- #define CONFIG_SYS_I2C_MXC_I2C1               /* enable I2C bus 1 */
- #define CONFIG_SYS_I2C_MXC_I2C2               /* enable I2C bus 2 */
  
 -#define CONFIG_CONS_INDEX       1
  #define CONFIG_SYS_NS16550_SERIAL
  #define CONFIG_SYS_NS16550_REG_SIZE     1
  #define CONFIG_SYS_NS16550_CLK          (get_serial_clock())

diff --cc include/configs/ls1043a_common.h
Simple merge

diff --cc include/configs/ls1046a_common.h
Simple merge

diff --cc include/configs/ls1088a_common.h
index 211059a,393ce4f..814760e
--- 1/include/configs/ls1088a_common.h
--- 2/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@@ -67,13 -67,9 +67,8 @@@
  
  /* I2C */
  #define CONFIG_SYS_I2C
- #define CONFIG_SYS_I2C_MXC
- #define CONFIG_SYS_I2C_MXC_I2C1               /* enable I2C bus 1 */
- #define CONFIG_SYS_I2C_MXC_I2C2               /* enable I2C bus 2 */
- #define CONFIG_SYS_I2C_MXC_I2C3               /* enable I2C bus 3 */
- #define CONFIG_SYS_I2C_MXC_I2C4               /* enable I2C bus 4 */
  
  /* Serial Port */
 -#define CONFIG_CONS_INDEX       1
  #define CONFIG_SYS_NS16550_SERIAL
  #define CONFIG_SYS_NS16550_REG_SIZE     1
  #define CONFIG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)

diff --cc include/configs/ls2080a_common.h
index 4e6a26c,3e05b27..258a6f1
--- 1/include/configs/ls2080a_common.h
--- 2/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@@ -77,13 -77,9 +77,8 @@@
  
  /* I2C */
  #define CONFIG_SYS_I2C
- #define CONFIG_SYS_I2C_MXC
- #define CONFIG_SYS_I2C_MXC_I2C1               /* enable I2C bus 1 */
- #define CONFIG_SYS_I2C_MXC_I2C2               /* enable I2C bus 2 */
- #define CONFIG_SYS_I2C_MXC_I2C3               /* enable I2C bus 3 */
- #define CONFIG_SYS_I2C_MXC_I2C4               /* enable I2C bus 4 */
  
  /* Serial Port */
 -#define CONFIG_CONS_INDEX       1
  #define CONFIG_SYS_NS16550_SERIAL
  #define CONFIG_SYS_NS16550_REG_SIZE     1
  #define CONFIG_SYS_NS16550_CLK          (get_serial_clock())

diff --cc include/configs/ls2080a_simu.h
Simple merge

diff --cc include/configs/mx53ppd.h
Simple merge

diff --cc include/configs/mx7_common.h
Simple merge