Merge tag 'v2021.07-rc5' into next

Prepare v2021.07-rc5

# gpg: Signature made Mon 28 Jun 2021 03:39:36 PM EDT
# gpg:                using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]

# Conflicts:
#	configs/am64x_evm_r5_defconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc configs/am64x_evm_a53_defconfig
Simple merge

diff --cc configs/am64x_evm_r5_defconfig
index 3e9b5650c60d035ed7e3eeb60a3f294e5b9009d7,bee4f5898176aa1e1dd9db6f97e00c71069c0ed7..4a16cdea2ef98ab25e541a1562a34b924bfc3564
--- 1/configs/am64x_evm_r5_defconfig
--- 2/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@@ -21,19 -22,15 +22,18 @@@ CONFIG_SPL_FS_FAT=
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
- CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-evm"
  CONFIG_SPL_LOAD_FIT=y
 +CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y
  CONFIG_SPL_SIZE_LIMIT_SUBTRACT_MALLOC=y
  CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
++CONFIG_SPL_BOARD_INIT=y
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_EARLY_BSS=y
- CONFIG_SPL_BOARD_INIT=y
 +CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_DM_MAILBOX=y
  CONFIG_SPL_DM_SPI_FLASH=y
@@@ -115,22 -101,4 +115,20 @@@ CONFIG_CADENCE_QSPI=
  CONFIG_TIMER=y
  CONFIG_SPL_TIMER=y
  CONFIG_OMAP_TIMER=y
- CONFIG_SPL_DM_USB=y
 +CONFIG_USB=y
 +CONFIG_DM_USB=y
- CONFIG_SPL_USB_CDNS3_GADGET=y
 +CONFIG_DM_USB_GADGET=y
 +CONFIG_SPL_DM_USB_GADGET=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_CDNS3=y
 +CONFIG_USB_CDNS3_GADGET=y
- CONFIG_USB_CDNS3_TI=y
 +CONFIG_USB_CDNS3_HOST=y
++CONFIG_SPL_USB_CDNS3_GADGET=y
 +CONFIG_SPL_USB_CDNS3_HOST=y
 +CONFIG_USB_STORAGE=y
 +CONFIG_USB_GADGET=y
 +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
 +CONFIG_USB_GADGET_PRODUCT_NUM=0x6165
 +CONFIG_USB_GADGET_DOWNLOAD=y
  CONFIG_FS_FAT_MAX_CLUSTSIZE=16384

diff --cc configs/am65x_evm_a53_defconfig
Simple merge

diff --cc configs/am65x_evm_r5_usbdfu_defconfig
Simple merge

diff --cc configs/am65x_hs_evm_a53_defconfig
Simple merge

diff --cc configs/apalis-imx8_defconfig
Simple merge

diff --cc configs/apalis-imx8x_defconfig
Simple merge

diff --cc configs/apalis-tk1_defconfig
Simple merge

diff --cc configs/apalis_t30_defconfig
Simple merge

diff --cc configs/beaver_defconfig
Simple merge

diff --cc configs/cei-tk1-som_defconfig
Simple merge

diff --cc configs/cherryhill_defconfig
Simple merge

diff --cc configs/chromebook_coral_defconfig
Simple merge

diff --cc configs/chromebook_link64_defconfig
Simple merge

diff --cc configs/chromebook_link_defconfig
Simple merge

diff --cc configs/chromebook_samus_defconfig
Simple merge

diff --cc configs/colibri-imx8x_defconfig
Simple merge

diff --cc configs/colibri_t20_defconfig
Simple merge

diff --cc configs/colibri_t30_defconfig
Simple merge

diff --cc configs/colibri_vf_defconfig
Simple merge

diff --cc configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
Simple merge

diff --cc configs/coreboot64_defconfig
Simple merge

diff --cc configs/coreboot_defconfig
Simple merge

diff --cc configs/corvus_defconfig
Simple merge

diff --cc configs/dalmore_defconfig
Simple merge

diff --cc configs/dh_imx6_defconfig
Simple merge

diff --cc configs/draco_defconfig
Simple merge

diff --cc configs/efi-x86_payload32_defconfig
Simple merge

diff --cc configs/efi-x86_payload64_defconfig
Simple merge

diff --cc configs/etamin_defconfig
Simple merge

diff --cc configs/gardena-smart-gateway-at91sam_defconfig
Simple merge

diff --cc configs/j7200_evm_r5_defconfig
Simple merge

diff --cc configs/j721e_evm_r5_defconfig
Simple merge

diff --cc configs/jetson-tk1_defconfig
Simple merge

diff --cc configs/khadas-edge-captain-rk3399_defconfig
Simple merge

diff --cc configs/khadas-edge-rk3399_defconfig
Simple merge

diff --cc configs/khadas-edge-v-rk3399_defconfig
Simple merge

diff --cc configs/minnowmax_defconfig
Simple merge

diff --cc configs/nyan-big_defconfig
Simple merge

diff --cc configs/odroid-xu3_defconfig
Simple merge

diff --cc configs/origen_defconfig
Simple merge

diff --cc configs/p2371-0000_defconfig
Simple merge

diff --cc configs/p2371-2180_defconfig
Simple merge

diff --cc configs/p2571_defconfig
Simple merge

diff --cc configs/p3450-0000_defconfig
Simple merge

diff --cc configs/pico-dwarf-imx6ul_defconfig
Simple merge

diff --cc configs/pico-hobbit-imx6ul_defconfig
Simple merge

diff --cc configs/pico-imx6_defconfig
Simple merge

diff --cc configs/pico-imx6ul_defconfig
Simple merge

diff --cc configs/pico-pi-imx6ul_defconfig
Simple merge

diff --cc configs/pxm2_defconfig
Simple merge

diff --cc configs/qemu-x86_64_defconfig
Simple merge

diff --cc configs/rastaban_defconfig
Simple merge

diff --cc configs/rut_defconfig
Simple merge

diff --cc configs/s5p_goni_defconfig
Simple merge

diff --cc configs/sam9x60ek_mmc_defconfig
Simple merge

diff --cc configs/sam9x60ek_nandflash_defconfig
Simple merge

diff --cc configs/sam9x60ek_qspiflash_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_mmc1_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_mmc_defconfig
Simple merge

diff --cc configs/sama5d27_som1_ek_qspiflash_defconfig
Simple merge

diff --cc configs/sama5d27_wlsom1_ek_mmc_defconfig
Simple merge

diff --cc configs/sama5d27_wlsom1_ek_qspiflash_defconfig
Simple merge

diff --cc configs/sama5d2_icp_mmc_defconfig
Simple merge

diff --cc configs/sama5d2_ptc_ek_mmc_defconfig
Simple merge

diff --cc configs/sama5d2_ptc_ek_nandflash_defconfig
Simple merge

diff --cc configs/sama5d2_xplained_emmc_defconfig
Simple merge

diff --cc configs/sama5d2_xplained_mmc_defconfig
Simple merge

diff --cc configs/sama5d2_xplained_qspiflash_defconfig
Simple merge

diff --cc configs/sama5d2_xplained_spiflash_defconfig
Simple merge

diff --cc configs/sama5d3_xplained_mmc_defconfig
Simple merge

diff --cc configs/sama5d3_xplained_nandflash_defconfig
Simple merge

diff --cc configs/sama5d4_xplained_mmc_defconfig
Simple merge

diff --cc configs/sama5d4_xplained_nandflash_defconfig
Simple merge

diff --cc configs/sama5d4_xplained_spiflash_defconfig
Simple merge

diff --cc configs/sama7g5ek_mmc1_defconfig
Simple merge

diff --cc configs/sama7g5ek_mmc_defconfig
Simple merge

diff --cc configs/sandbox64_defconfig
Simple merge

diff --cc configs/sandbox_defconfig
Simple merge

diff --cc configs/sandbox_flattree_defconfig
Simple merge

diff --cc configs/smartweb_defconfig
Simple merge

diff --cc configs/socfpga_arria5_defconfig
Simple merge

diff --cc configs/socfpga_cyclone5_defconfig
Simple merge

diff --cc configs/socfpga_dbm_soc1_defconfig
Simple merge

diff --cc configs/socfpga_de0_nano_soc_defconfig
Simple merge

diff --cc configs/socfpga_de10_nano_defconfig
Simple merge

diff --cc configs/socfpga_mcvevk_defconfig
Simple merge

diff --cc configs/socfpga_sockit_defconfig
Simple merge

diff --cc configs/socfpga_socrates_defconfig
Simple merge

diff --cc configs/socfpga_vining_fpga_defconfig
Simple merge

diff --cc configs/som-db5800-som-6867_defconfig
Simple merge

diff --cc configs/taurus_defconfig
Simple merge

diff --cc configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
Simple merge

diff --cc configs/theadorable-x86-conga-qa3-e3845_defconfig
Simple merge

diff --cc configs/theadorable-x86-dfi-bt700_defconfig
Simple merge

diff --cc configs/thuban_defconfig
Simple merge

diff --cc configs/topic_miami_defconfig
Simple merge

diff --cc configs/topic_miamilite_defconfig
Simple merge

diff --cc configs/topic_miamiplus_defconfig
Simple merge

diff --cc configs/venice2_defconfig
Simple merge

diff --cc configs/warp7_bl33_defconfig
Simple merge

diff --cc configs/warp7_defconfig
Simple merge

diff --cc configs/warp_defconfig
Simple merge

diff --cc configs/xilinx_zynq_virt_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_virt_defconfig
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge

diff --cc test/dm/ofnode.c
Simple merge