From: Tom Rini <trini@konsulko.com>
Date: Wed, 1 May 2019 03:21:27 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=b4ee6daad7a2604ca9466b2ba48de86cc27d381f;p=u-boot.git

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

b4ee6daad7a2604ca9466b2ba48de86cc27d381f
diff --cc configs/mx53ppd_defconfig
index daa74ddd68,2379ab8c66..6c3818d845
--- a/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/pico-hobbit-imx7d_defconfig
index 14a08eee34,c75532e9a6..33f2a0ad71
--- a/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 29b0745c9e,818032ef18..41374a33bf
--- a/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 9e1efbb582,926e70e9f6..81d19df04c
--- a/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