Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx

u-boot-imx-20190612
--------------------

- Board fixes:
	- imx6logic
	- wandboard
	- mx6sabre boots again
	- imx8qm_mek
	- pico-* boards
	- Toradex apalis / colibri
	- engicam imx6 (environment)
	- KP MX53
	- opos6ul
- Switch to DM:
	- vining2000
	- dh MX6
	- Toradex colibri i.MX7
	- Novena
- Security : fix CSF size for HAB
- Other:
      - imx: fix building for i.mx8 without spl
      - pcie and switch to DM

      mx6sabreauto: Enable SPL SDP support

diff --cc Makefile
Simple merge

diff --cc arch/arm/dts/imx7-colibri-emmc.dts
index 8db2a6270783f79cf2a80ceba144b873f036b577,deb5482e3e2aa6060a7e3ffa87f5c4a146e39a70..bc0d10c716d369a61a644d3fde48768dfff3d991
--- 1/arch/arm/dts/imx7-colibri-emmc.dts
--- 2/arch/arm/dts/imx7-colibri-emmc.dts
+++ b/arch/arm/dts/imx7-colibri-emmc.dts
@@@ -11,10 -11,9 +11,11 @@@
        compatible = "toradex,imx7d-colibri-emmc", "fsl,imx7d";
  
        aliases {
 +              u-boot,dm-pre-reloc;
                mmc0 = &usdhc3;
                mmc1 = &usdhc1;
 +              display1 = &lcdif;
+               usb0 = &usbotg1; /* required for ums */
        };
  
        chosen {

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

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

diff --cc common/spl/Kconfig
Simple merge

diff --cc configs/colibri_imx6_defconfig
Simple merge

diff --cc configs/colibri_imx7_emmc_defconfig
index 9312de9406c45bb08f4e0a9d1b87659b39c6bb40,2fa9f1f53244d79c4d29cb7c8d5f764ee842e2ab..bb11524794332a80ef14c14055cf06607d5b382b
--- 1/configs/colibri_imx7_emmc_defconfig
--- 2/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@@ -63,6 -64,15 +64,15 @@@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b6
  CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
  CONFIG_CI_UDC=y
  CONFIG_USB_GADGET_DOWNLOAD=y
 -CONFIG_VIDEO=y
 +CONFIG_DM_VIDEO=y
  CONFIG_FAT_WRITE=y
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_DM_USB=y
+ CONFIG_FASTBOOT=y
+ CONFIG_FASTBOOT_USB_DEV=0
+ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+ CONFIG_USB_FUNCTION_FASTBOOT=y
+ CONFIG_FASTBOOT_BUF_ADDR=0x82000000
+ CONFIG_FASTBOOT_BUF_SIZE=0x10000000

diff --cc configs/colibri_t20_defconfig
Simple merge

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