Merge tag 'v2021.10-rc5' into next

Prepare v2021.10-rc5

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc board/raspberrypi/rpi/rpi.c
Simple merge

diff --cc configs/rpi_0_w_defconfig
Simple merge

diff --cc configs/rpi_2_defconfig
Simple merge

diff --cc configs/rpi_3_32b_defconfig
Simple merge

diff --cc configs/rpi_3_b_plus_defconfig
Simple merge

diff --cc configs/rpi_3_defconfig
Simple merge

diff --cc configs/rpi_4_32b_defconfig
Simple merge

diff --cc configs/rpi_4_defconfig
Simple merge

diff --cc configs/rpi_arm64_defconfig
Simple merge

diff --cc configs/rpi_defconfig
Simple merge

diff --cc configs/socfpga_vining_fpga_defconfig
index a070359,cbdb897..5e7fda3
--- 1/configs/socfpga_vining_fpga_defconfig
--- 2/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@@ -1,9 -1,8 +1,9 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_SOCFPGA=y
- CONFIG_ENV_SIZE=0x2000
+ CONFIG_ENV_SIZE=0x4000
  CONFIG_ENV_OFFSET=0x100000
  CONFIG_ENV_SECT_SIZE=0x10000
 +CONFIG_SYS_MALLOC_LEN=0x4000000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
  CONFIG_SPL_TEXT_BASE=0xFFFF0000
@@@ -73,8 -71,13 +74,11 @@@ CONFIG_LED_STATUS_CMD=
  CONFIG_MISC=y
  CONFIG_I2C_EEPROM=y
  CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 -CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=3
 -CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=70
  CONFIG_MMC_DW=y
  CONFIG_MTD=y
+ CONFIG_SF_DEFAULT_MODE=0x0
+ CONFIG_SF_DEFAULT_SPEED=40000000
+ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_STMICRO=y
  # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set

diff --cc doc/develop/index.rst
Simple merge

diff --cc include/configs/bcmstb.h
Simple merge

diff --cc include/configs/socfpga_vining_fpga.h
index c4a3df2,38a7753..d9d0a4a
--- 1/include/configs/socfpga_vining_fpga.h
--- 2/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@@ -14,9 -14,9 +14,7 @@@
  #define CONFIG_BOOTFILE               "fitImage"
  #define CONFIG_BOOTCOMMAND    "run selboot"
  #define CONFIG_SYS_BOOTM_LEN  0x2000000       /* 32 MiB */
 -#define CONFIG_LOADADDR               0x01000000
 -#define CONFIG_SYS_LOAD_ADDR  CONFIG_LOADADDR
  
- /* Ethernet on SoC (EMAC) */
- 
  /* Extra Environment */
  #define CONFIG_HOSTNAME                       "socfpga_vining_fpga"
  

diff --cc include/configs/zmx25.h
Simple merge

diff --cc lib/efi_loader/Kconfig
Simple merge

diff --cc lib/efi_loader/efi_tcg2.c
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge