Merge tag 'u-boot-imx-20210625' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 25 Jun 2021 17:33:47 +0000 (13:33 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 25 Jun 2021 17:33:47 +0000 (13:33 -0400)
Fixes for 2021.07
-----------------

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


Trivial merge