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>

diff --cc configs/apalis_imx6_defconfig
Simple merge

diff --cc configs/aristainetos2_defconfig
Simple merge

diff --cc configs/aristainetos2b_defconfig
Simple merge

diff --cc configs/aristainetos2bcsl_defconfig
Simple merge

diff --cc configs/aristainetos2c_defconfig
Simple merge

diff --cc configs/brppt2_defconfig
Simple merge

diff --cc configs/cgtqmx6eval_defconfig
Simple merge

diff --cc configs/cm_fx6_defconfig
Simple merge

diff --cc configs/colibri-imx6ull_defconfig
Simple merge

diff --cc configs/colibri_imx6_defconfig
Simple merge

diff --cc configs/dms-ba16-1g_defconfig
Simple merge

diff --cc configs/dms-ba16_defconfig
Simple merge

diff --cc configs/gwventana_emmc_defconfig
Simple merge

diff --cc configs/gwventana_gw5904_defconfig
Simple merge

diff --cc configs/gwventana_nand_defconfig
Simple merge

diff --cc configs/imx6dl_icore_nand_defconfig
Simple merge

diff --cc configs/imx6q_icore_nand_defconfig
Simple merge

diff --cc configs/imx6qdl_icore_mmc_defconfig
Simple merge

diff --cc configs/imx6qdl_icore_nand_defconfig
Simple merge

diff --cc configs/marsboard_defconfig
Simple merge

diff --cc configs/mx6cuboxi_defconfig
Simple merge

diff --cc configs/mx6qsabrelite_defconfig
Simple merge

diff --cc configs/mx6sabreauto_defconfig
Simple merge

diff --cc configs/mx6sabresd_defconfig
Simple merge

diff --cc configs/mx6sxsabresd_defconfig
Simple merge

diff --cc configs/mx6ul_14x14_evk_defconfig
Simple merge

diff --cc configs/mx6ul_9x9_evk_defconfig
Simple merge

diff --cc configs/nitrogen6dl2g_defconfig
Simple merge

diff --cc configs/nitrogen6dl_defconfig
Simple merge

diff --cc configs/nitrogen6q2g_defconfig
Simple merge

diff --cc configs/nitrogen6q_defconfig
Simple merge

diff --cc configs/nitrogen6s1g_defconfig
Simple merge

diff --cc configs/nitrogen6s_defconfig
Simple merge

diff --cc configs/novena_defconfig
Simple merge

diff --cc configs/opos6uldev_defconfig
Simple merge

diff --cc configs/pico-dwarf-imx6ul_defconfig
Simple merge

diff --cc configs/pico-hobbit-imx6ul_defconfig
Simple merge

diff --cc configs/pico-imx6_defconfig
Simple merge

diff --cc configs/pico-imx6ul_defconfig
index da51e378eb4cfa236110c4c87c2adafb4d2fb54c,00b93d0566a6deab892c59a8679c7c9d57573275..0056b392e813677f91705caa62b84a128bf007e1
--- 1/configs/pico-imx6ul_defconfig
--- 2/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

diff --cc configs/pico-pi-imx6ul_defconfig
Simple merge

diff --cc configs/riotboard_defconfig
Simple merge

diff --cc configs/riotboard_spl_defconfig
Simple merge

diff --cc configs/wandboard_defconfig
Simple merge