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

u-boot-imx-20191009
-------------------

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

- MX6UL / ULZ
- Toradex board
- Allow to set OCRAM for MX6Q/D
- MX7ULP
- MX8: (container image, imx8mq_mek), SCU API
- fix several board booting from SD/EMMC (cubox-i for example)
- pico boards

[trini: display5 merged manually]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc common/spl/Kconfig
index ef4fb19e52c995620506f873d66fec8e0dabc75c,f59b6f5b51f41b80073ab72ac5ebf847983651f3..57d06ccece5952126b5ffea348a3cc23f373a3c2
--- 1/common/spl/Kconfig
--- 2/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@@ -26,9 -26,10 +26,10 @@@ config SPL_FRAMEWOR
          and the Linux Kernel.  If unsure, say Y.
  
  config SPL_SIZE_LIMIT
 -      int "Maximum size of SPL image"
 +      hex "Maximum size of SPL image"
        depends on SPL
-       default 69632 if ARCH_MX6
+       default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB
+       default 200704 if ARCH_MX6 && MX6_OCRAM_256KB
        default 0
        help
          Specifies the maximum length of the U-Boot SPL image.

diff --cc configs/display5_defconfig
index fdabd31c90a6be5422b7ae16d40db2777d5c00a0,46bcdaffc835a3d9d8d9bb376285a652bcbbc1b9..3227249413e43b490db8cb512370c563c33d5f6f
--- 1/configs/display5_defconfig
--- 2/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@@ -82,5 -108,7 +108,8 @@@ CONFIG_DM_REGULATOR_PFUZE100=
  CONFIG_MXC_UART=y
  CONFIG_SPI=y
  CONFIG_MXC_SPI=y
 +CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
+ CONFIG_SYSRESET=y
+ CONFIG_SYSRESET_WATCHDOG=y
+ CONFIG_I2C_EDID=y
  CONFIG_IMX_WATCHDOG=y

diff --cc configs/display5_factory_defconfig
index d403ad9480778e225b7e08e6dc2e4097befef94b,c515d14a80eae91464fa5d7f9e87995906b3974a..a41a6329cb8cf772299fd97ccb82cee83f77cf8b
--- 1/configs/display5_factory_defconfig
--- 2/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@@ -80,13 -111,16 +111,17 @@@ CONFIG_DM_REGULATOR_PFUZE100=
  CONFIG_MXC_UART=y
  CONFIG_SPI=y
  CONFIG_MXC_SPI=y
+ CONFIG_SYSRESET=y
+ CONFIG_SYSRESET_WATCHDOG=y
  CONFIG_USB=y
+ CONFIG_DM_USB=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_GADGET_MANUFACTURER="Liebherr"
- CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
- CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
+ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
  CONFIG_CI_UDC=y
  CONFIG_USB_GADGET_DOWNLOAD=y
 +CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
+ CONFIG_I2C_EDID=y
  CONFIG_IMX_WATCHDOG=y
- CONFIG_OF_LIBFDT=y
+ CONFIG_PANIC_HANG=y

diff --cc include/configs/display5.h
index 182399a390f166af39f838a94e68f7b0817bbb35,de11ff61c66121514c3115da33975f9599f916fb..d80641568eb44c8294cbc7713762c984b9305574
--- 1/include/configs/display5.h
--- 2/include/configs/display5.h
+++ b/include/configs/display5.h
@@@ -354,7 -341,12 +341,12 @@@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
  
  /* Watchdog */
 -#define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
+ #if defined(CONFIG_SPL_BUILD)
+ #undef CONFIG_WDT
+ #undef CONFIG_WATCHDOG
+ #define CONFIG_HW_WATCHDOG
+ #endif
 +
  /* ENV config */
  #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
  #define CONFIG_ENV_SIZE               (SZ_64K)

diff --cc include/spl.h
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge