From: Tom Rini <trini@konsulko.com>
Date: Fri, 9 Apr 2021 11:41:32 +0000 (-0400)
Subject: Merge tag 'u-boot-imx-20210409' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
X-Git-Tag: baikal/mips/sdk5.9~34^2^2~109
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=de3c47451e2c5c38944577223bd74e20b3d9add4;p=uboot.git

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

u-boot-imx-20210409
-------------------

- Secure Boot :
	- HAB for MX8M / MX7ULP
	- CAAM fixes
- Fixes for imxrt1020
- Fixes for USDHC driver
- Fixes for Toradex (Colibri / Apalis)
- Switch to DM for several boards
	- mx23 olinuxo
	- usbarmory
	- marsboard / riotboard
	- Gateworks GW Ventana
- NXP upstream patches (LPDDR / CAAM / HAB)

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/7089
---

de3c47451e2c5c38944577223bd74e20b3d9add4
diff --cc board/freescale/imx8mp_evk/lpddr4_timing.c
index 7658262b37,8c5306d5d2..8c5306d5d2
mode 100644,100755..100644
--- a/board/freescale/imx8mp_evk/lpddr4_timing.c
+++ b/board/freescale/imx8mp_evk/lpddr4_timing.c