Merging in latest from upstream (LFAC/uboot-nxp:refs/heads/imx_v2021.04)
authorGaurav Jain <gaurav.jain@nxp.com>
Tue, 18 May 2021 07:10:09 +0000 (09:10 +0200)
committerGaurav Jain <gaurav.jain@nxp.com>
Tue, 18 May 2021 07:10:09 +0000 (09:10 +0200)
commit2afb4d10a87babfbf0b6f989307dd533162eb041
treebdc329bc2f437571c63d7fffc8f8fb1edd374e80
parentc8fded22e6b45557e102c84bf2651a6466348855
parent4272c700e189240ca1befba02dd6c0ee795c1751
Merging in latest from upstream (LFAC/uboot-nxp:refs/heads/imx_v2021.04)

* commit '4272c700e189240ca1befba02dd6c0ee795c1751':
  LF-3782 fastboot: Select USB_GADGET_OS_DESCRIPTORS for fastboot function
  MLK-25497 nand: mxs_nand_spl: Fix nand_spl_adjust_offset issue
  MLK-25496 imx6: Fix CONFIG_SYS_MMC_ENV_DEV for QSPI/SPI/EIM boot