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

Porting to DM and i.MX8
------------------------

- warp7 to DM
- kp_imx53 to DM
- Warnings in DT
- MX8QM support
- colibri-imx6ull to DM
- imx7d-pico to DM
- ocotp for MX8

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_imx6_defconfig
Simple merge

diff --cc configs/imx6q_logic_defconfig
Simple merge

diff --cc configs/imx8qxp_mek_defconfig
Simple merge

diff --cc configs/kp_imx53_defconfig
Simple merge

diff --cc configs/m53menlo_defconfig
Simple merge

diff --cc configs/mx51evk_defconfig
Simple merge

diff --cc configs/mx53loco_defconfig
Simple merge

diff --cc configs/mx53ppd_defconfig
index daa74ddd687f33fee1d9f75afb236dd465a66d39,2379ab8c66dcbb76857125fe54b217146d9fc272..6c3818d845d66d25d35ca1309d45831f7367680a
--- 1/configs/mx53ppd_defconfig
--- 2/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@@ -38,14 -33,23 +38,16 @@@ CONFIG_BOOTCOUNT_EXT=
  CONFIG_BOOTCOUNT_BOOTLIMIT=10
  CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"
  CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 +CONFIG_DM_MMC=y
  CONFIG_FSL_ESDHC=y
  CONFIG_MII=y
 +CONFIG_PINCTRL=y
 +CONFIG_PINCTRL_IMX5=y
  CONFIG_RTC_S35392A=y
  CONFIG_USB=y
- CONFIG_VIDEO_IPUV3=y
+ CONFIG_USB_EHCI_MX5=y
+ CONFIG_USB_STORAGE=y
  CONFIG_VIDEO=y
+ CONFIG_VIDEO_IPUV3=y
  # CONFIG_VIDEO_SW_CURSOR is not set
  CONFIG_IMX_WATCHDOG=y
 -CONFIG_OF_LIBFDT=y
 -CONFIG_DM=y
 -CONFIG_CMD_DM=y
 -CONFIG_OF_CONTROL=y
 -CONFIG_DEFAULT_DEVICE_TREE="imx53-ppd"
 -CONFIG_DM_MMC=y
 -CONFIG_BLK=y
 -CONFIG_PINCTRL=y
 -CONFIG_PINCTRL_IMX5=y
 -CONFIG_OF_BOARD_SETUP=y

diff --cc configs/omap35_logic_defconfig
Simple merge

diff --cc configs/omap35_logic_somlv_defconfig
Simple merge

diff --cc configs/omap3_logic_defconfig
Simple merge

diff --cc configs/omap3_logic_somlv_defconfig
Simple merge

diff --cc configs/pico-hobbit-imx7d_defconfig
index 14a08eee34af4c2de75cd4411d48d53a24423d7c,c75532e9a6b56cc049b564bc5b5f9e51618edc65..33f2a0ad71cb0f8ab67d7a9571e98118299091da
--- 1/configs/pico-hobbit-imx7d_defconfig
--- 2/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@@ -16,8 -15,10 +16,10 @@@ CONFIG_DISTRO_DEFAULTS=
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
+ CONFIG_OF_CONTROL=y
+ CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hobbit"
  CONFIG_BOUNCE_BUFFER=y
 +CONFIG_SPL_TEXT_BASE=0x00911000
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_USB_HOST_SUPPORT=y
  CONFIG_SPL_USB_GADGET=y

diff --cc configs/pico-imx7d_defconfig
index 29b0745c9eba8858e92b2f7b19673bf13f370668,818032ef18f64035e6ba3d12a2e6f94d1d79f49f..41374a33bff990d577b8edcdd0e6a305e7702be3
--- 1/configs/pico-imx7d_defconfig
--- 2/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@@ -16,8 -15,10 +16,10 @@@ CONFIG_DISTRO_DEFAULTS=
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
  CONFIG_DEFAULT_FDT_FILE="ask"
+ CONFIG_OF_CONTROL=y
+ CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_BOUNCE_BUFFER=y
 +CONFIG_SPL_TEXT_BASE=0x00911000
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_USB_HOST_SUPPORT=y
  CONFIG_SPL_USB_GADGET=y

diff --cc configs/pico-pi-imx7d_defconfig
index 9e1efbb582007ab93556622f1d734ae9b7d074b9,926e70e9f6ee16cc73ea11f64179e3138c50c05c..81d19df04c085229d9f67180e7e09e6643f66443
--- 1/configs/pico-pi-imx7d_defconfig
--- 2/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@@ -16,8 -15,10 +16,10 @@@ CONFIG_DISTRO_DEFAULTS=
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb"
+ CONFIG_OF_CONTROL=y
+ CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
  CONFIG_BOUNCE_BUFFER=y
 +CONFIG_SPL_TEXT_BASE=0x00911000
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_USB_HOST_SUPPORT=y
  CONFIG_SPL_USB_GADGET=y

diff --cc configs/usbarmory_defconfig
Simple merge

diff --cc configs/warp7_defconfig
Simple merge

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

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

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

diff --cc scripts/config_whitelist.txt
Simple merge