Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04
authorBJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
Tue, 18 May 2021 05:23:57 +0000 (07:23 +0200)
committerBJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
Tue, 18 May 2021 05:23:57 +0000 (07:23 +0200)
commit1d8379df70782a5d4747c97e3552b0ed8d1279e4
tree133335217877fd1b9b0e39162c8c0c35d250ce29
parent7dc18dfd8c428e91395cc5a535f5c832035910a1
parent4272c700e189240ca1befba02dd6c0ee795c1751
Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  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