From: Tom Rini <trini@konsulko.com>
Date: Wed, 26 Aug 2020 03:12:43 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=7a1a01c6029039e4fa6aa185cdbbf9a357eecba7;p=u-boot.git

Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

For 2020.10
-----------

- mx6: SOCs user selectable
       Fix for imx6q_logic
       Some DM conversion
- mx7: introduce secondary boot device

Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010

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

7a1a01c6029039e4fa6aa185cdbbf9a357eecba7
diff --cc configs/pico-imx6ul_defconfig
index da51e378eb,00b93d0566..0056b392e8
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@@ -73,6 -77,4 +77,7 @@@ CONFIG_USB_GADGET_MANUFACTURER="FSL
  CONFIG_USB_GADGET_VENDOR_NUM=0x0525
  CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
 +CONFIG_VIDEO=y
 +CONFIG_SPLASH_SCREEN=y
 +CONFIG_SPLASH_SCREEN_ALIGN=y
+ CONFIG_DM_VIDEO=y