From: Tom Rini <trini@konsulko.com>
Date: Tue, 11 Jun 2019 17:41:24 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=529faf80c339b78bd361b59735664f2605322b8e;p=u-boot.git

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
---

529faf80c339b78bd361b59735664f2605322b8e
diff --cc arch/arm/dts/imx7-colibri-emmc.dts
index 8db2a62707,deb5482e3e..bc0d10c716
--- a/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 configs/colibri_imx7_emmc_defconfig
index 9312de9406,2fa9f1f532..bb11524794
--- a/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