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

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

- fixes for Toradex board
- fix warnings from previous PR
- HAB: reset instead of panic after failure
- new board:  MYiR Tech MYS-6ULX
- mx6cuboxi: use OF_PLATDATA
- further changes for DM

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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc configs/colibri-imx6ull_defconfig
Simple merge

diff --cc configs/colibri_imx7_defconfig
Simple merge

diff --cc configs/colibri_imx7_emmc_defconfig
index b433437,3056cc0..8355fef
--- 1/configs/colibri_imx7_emmc_defconfig
--- 2/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@@ -84,4 -83,7 +84,6 @@@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b6
  CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
  CONFIG_CI_UDC=y
  CONFIG_DM_VIDEO=y
 -CONFIG_FAT_WRITE=y
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_BOARD_LATE_INIT=y
+ CONFIG_SYS_WHITE_ON_BLACK=y

diff --cc configs/mx6cuboxi_defconfig
index 0e1e641,59214ba..02f7279
--- 1/configs/mx6cuboxi_defconfig
--- 2/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@@ -40,9 -39,10 +40,10 @@@ CONFIG_CMD_EXT4_WRITE=
  # CONFIG_SPL_PARTITION_UUIDS is not set
  CONFIG_OF_CONTROL=y
  CONFIG_SPL_OF_CONTROL=y
 -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-hummingboard2-emmc-som-v15"
  CONFIG_OF_LIST="imx6dl-hummingboard2-emmc-som-v15 imx6q-hummingboard2-emmc-som-v15"
  CONFIG_MULTI_DTB_FIT=y
 +CONFIG_ENV_OVERWRITE=y
+ CONFIG_SPL_OF_PLATDATA=y
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

diff --cc configs/pcm058_defconfig
index e8a263b,b085a7d..045ef16
--- 1/configs/pcm058_defconfig
--- 2/configs/pcm058_defconfig
+++ b/configs/pcm058_defconfig
@@@ -7,12 -7,12 +7,12 @@@ CONFIG_SPL_LIBGENERIC_SUPPORT=
  CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x10000
- CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
+ CONFIG_SYS_SPI_U_BOOT_OFFS=0x31400
  CONFIG_MX6_OCRAM_256KB=y
  CONFIG_TARGET_PCM058=y
 -CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_DM_GPIO=y
  CONFIG_SPL_DM_SPI=y
 +CONFIG_SPL_TEXT_BASE=0x00908000
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_NR_DRAM_BANKS=1

diff --cc configs/pico-imx6_defconfig
Simple merge

diff --cc configs/verdin-imx8mm_defconfig
Simple merge

diff --cc drivers/gpio/mxc_gpio.c
index a16f571,fc7d296..88b920a
--- 1/drivers/gpio/mxc_gpio.c
--- 2/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@@ -297,14 -309,15 +309,15 @@@ static int mxc_gpio_probe(struct udevic
  
  static int mxc_gpio_ofdata_to_platdata(struct udevice *dev)
  {
-       fdt_addr_t addr;
        struct mxc_gpio_plat *plat = dev_get_platdata(dev);
 -              addr = devfdt_get_addr(dev);
+       if (!CONFIG_IS_ENABLED(OF_PLATDATA)) {
+               fdt_addr_t addr;
++              addr = dev_read_addr(dev);
+               if (addr == FDT_ADDR_T_NONE)
+                       return -EINVAL;
  
-       addr = dev_read_addr(dev);
-       if (addr == FDT_ADDR_T_NONE)
-               return -EINVAL;
- 
-       plat->regs = (struct gpio_regs *)addr;
+               plat->regs = (struct gpio_regs *)addr;
+       }
        plat->bank_index = dev->req_seq;
  
        return 0;

diff --cc drivers/video/imx/mxc_ipuv3_fb.c
Simple merge

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

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

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