Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Wed, 1 May 2019 03:21:27 +0000 (23:21 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 1 May 2019 11:25:51 +0000 (07:25 -0400)
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

24 files changed:
1  2 
arch/arm/Kconfig
arch/arm/dts/Makefile
configs/colibri-imx6ull_defconfig
configs/colibri_imx6_defconfig
configs/imx6q_logic_defconfig
configs/imx8qxp_mek_defconfig
configs/kp_imx53_defconfig
configs/m53menlo_defconfig
configs/mx51evk_defconfig
configs/mx53loco_defconfig
configs/mx53ppd_defconfig
configs/omap35_logic_defconfig
configs/omap35_logic_somlv_defconfig
configs/omap3_logic_defconfig
configs/omap3_logic_somlv_defconfig
configs/pico-hobbit-imx7d_defconfig
configs/pico-imx7d_defconfig
configs/pico-pi-imx7d_defconfig
configs/usbarmory_defconfig
configs/warp7_defconfig
include/configs/imx8qxp_mek.h
include/configs/m53menlo.h
include/configs/omap3_logic.h
scripts/config_whitelist.txt

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