projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dc18df 4272c70)
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)
* 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


Trivial merge