From: Tom Rini <trini@konsulko.com>
Date: Wed, 9 Oct 2019 13:35:43 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
X-Git-Tag: v2020.01-rc1~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eaa0bde05186b1738d221bc5effc6f257a14e360;p=oweals%2Fu-boot.git

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

eaa0bde05186b1738d221bc5effc6f257a14e360
diff --cc common/spl/Kconfig
index ef4fb19e52,f59b6f5b51..57d06ccece
--- a/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 fdabd31c90,46bcdaffc8..3227249413
--- a/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 d403ad9480,c515d14a80..a41a6329cb
--- a/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 182399a390,de11ff61c6..d80641568e
--- a/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)