Merge tag 'v2021.04-rc5' into next

Prepare v2021.04-rc5

diff --cc .azure-pipelines.yml
Simple merge

diff --cc Makefile
Simple merge

diff --cc common/image-fit.c
Simple merge

diff --cc doc/develop/driver-model/migration.rst
index 2284e8a6f70b4d3a1f59259fb7703740c0f1cc9a,0000000000000000000000000000000000000000..8d0bb7635b59afad0ded282a3acbaa5276644630
mode 100644,000000..100644
--- 1/doc/develop/driver-model/migration.rst
--- /dev/null
+++ b/doc/develop/driver-model/migration.rst
@@@ -1,101 -1,0 +1,109 @@@
 +.. SPDX-License-Identifier: GPL-2.0+
 +
 +Migration Schedule
 +==================
 +
 +U-Boot has been migrating to a new driver model since its introduction in
 +2014. This file describes the schedule for deprecation of pre-driver-model
 +features.
 +
 +CONFIG_DM
 +---------
 +
 +* Status: In progress
 +* Deadline: 2020.01
 +
 +Starting with the 2010.01 release CONFIG_DM will be enabled for all boards.
 +This does not concern CONFIG_DM_SPL and CONFIG_DM_TPL. The conversion date for
 +these configuration items still needs to be defined.
 +
 +CONFIG_DM_MMC
 +-------------
 +
 +* Status: In progress
 +* Deadline: 2019.04
 +
 +The subsystem itself has been converted and maintainers should submit patches
 +switching over to using CONFIG_DM_MMC and other base driver model options in
 +time for inclusion in the 2019.04 rerelease.
 +
 +CONFIG_DM_USB
 +-------------
 +
 +* Status: In progress
 +* Deadline: 2019.07
 +
 +The subsystem itself has been converted along with many of the host controller
 +and maintainers should submit patches switching over to using CONFIG_DM_USB and
 +other base driver model options in time for inclusion in the 2019.07 rerelease.
 +
 +CONFIG_SATA
 +-----------
 +
 +* Status: In progress
 +* Deadline: 2019.07
 +
 +The subsystem itself has been converted along with many of the host controller
 +and maintainers should submit patches switching over to using CONFIG_AHCI and
 +other base driver model options in time for inclusion in the 2019.07 rerelease.
 +
 +CONFIG_BLK
 +----------
 +
 +* Status: In progress
 +* Deadline: 2019.07
 +
 +In concert with maintainers migrating their block device usage to the
 +appropriate DM driver, CONFIG_BLK needs to be set as well.  The final deadline
 +here coincides with the final deadline for migration of the various block
 +subsystems.  At this point we will be able to audit and correct the logic in
 +Kconfig around using CONFIG_PARTITIONS and CONFIG_HAVE_BLOCK_DEVICE and make
 +use of CONFIG_BLK / CONFIG_SPL_BLK as needed.
 +
 +CONFIG_DM_SPI / CONFIG_DM_SPI_FLASH
 +-----------------------------------
 +
 +Board Maintainers should submit the patches for enabling DM_SPI and DM_SPI_FLASH
 +to move the migration with in the deadline.
 +
 +Partially converted::
 +
 +      drivers/spi/fsl_espi.c
 +      drivers/spi/mxc_spi.c
 +      drivers/spi/sh_qspi.c
 +
 +* Status: In progress
 +* Deadline: 2019.07
 +
 +CONFIG_DM_PCI
 +-------------
 +Deadline: 2019.07
 +
 +The PCI subsystem has supported driver model since mid 2015. Maintainers should
 +submit patches switching over to using CONFIG_DM_PCI and other base driver
 +model options in time for inclusion in the 2019.07 release.
 +
 +
 +CONFIG_DM_VIDEO
 +---------------
 +Deadline: 2019.07
 +
 +The video subsystem has supported driver model since early 2016. Maintainers
 +should submit patches switching over to using CONFIG_DM_VIDEO and other base
 +driver model options in time for inclusion in the 2019.07 release.
 +
 +CONFIG_DM_ETH
 +-------------
 +Deadline: 2020.07
 +
 +The network subsystem has supported the driver model since early 2015.
 +Maintainers should submit patches switching over to using CONFIG_DM_ETH and
 +other base driver model options in time for inclusion in the 2020.07 release.
++
++CONFIG_DM_I2C
++-------------
++Deadline: 2021.10
++
++The I2C subsystem has supported the driver model since early 2015.
++Maintainers should submit patches switching over to using CONFIG_DM_I2C and
++other base driver model options in time for inclusion in the 2021.10 release.

diff --cc doc/usage/index.rst
index fb834349ca3d5fd1ca75879e5ddef64aacb46ce4,6c59bbadab4528767cfa50b1db6e8a9533aecc2a..5faf279f4310d2d2915ef55dc5693c49350a5351
--- 1/doc/usage/index.rst
--- 2/doc/usage/index.rst
+++ b/doc/usage/index.rst
@@@ -4,8 -4,8 +4,9 @@@ Use U-Boo
  .. toctree::
     :maxdepth: 1
  
+    dfu
     fdt_overlays
 +   fit
     netconsole
     partitions
  

diff --cc include/dm/test.h
Simple merge

diff --cc include/image.h
Simple merge