Merge tag 'v2021.10-rc4' into next

Prepare v2021.10-rc4

Signed-off-by: Tom Rini <trini@konsulko.com>
# gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT
# gpg:                using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]

# Conflicts:
#	board/Arcturus/ucp1020/spl.c
#	cmd/mvebu/Kconfig
#	common/Kconfig.boot
#	common/image-fit.c
#	configs/UCP1020_defconfig
#	configs/sifive_unmatched_defconfig
#	drivers/pci/Kconfig
#	include/configs/UCP1020.h
#	include/configs/sifive-unmatched.h
#	lib/Makefile
#	scripts/config_whitelist.txt

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/mx6/Kconfig
Simple merge

diff --cc arch/arm/mach-mvebu/spl.c
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/Kconfig
Simple merge

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc board/freescale/common/Kconfig
Simple merge

diff --cc cmd/Kconfig
Simple merge

diff --cc cmd/mvebu/Kconfig
index 4afe0bf32ddb5d77b2e52b93a1c9f4daeb34d500,340fb3aff6b85e7731912a7e02c1423aeadbd0c1..ac8b0afd20e59d29c401ad00bfa5a121a61fa929
--- 1/cmd/mvebu/Kconfig
--- 2/cmd/mvebu/Kconfig
+++ b/cmd/mvebu/Kconfig
@@@ -3,6 -3,8 +3,7 @@@ depends on ARCH_MVEB
  
  config CMD_MVEBU_BUBT
        bool "bubt"
 -      default n
+       select SHA256 if ARMADA_3700
        help
          bubt - Burn a u-boot image to flash
          For details about bubt command please see the documentation

diff --cc common/Kconfig
Simple merge

diff --cc common/Kconfig.boot
Simple merge

diff --cc common/Makefile
index f7852607a55066080f2998dc22228536b25a60d0,ae0430c35fe460318b8711758815b8c84deaaf65..fb8173a5b8290a82ca0eb03beb652174a2203b20
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -66,10 -65,8 +65,8 @@@ ifdef CONFIG_SPL_BUIL
  ifdef CONFIG_SPL_DFU
  obj-$(CONFIG_DFU_OVER_USB) += dfu.o
  endif
- obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
- obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o
  obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
 -obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
 +obj-$(CONFIG_SPL_NET) += miiphyutil.o
  obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
  
  ifdef CONFIG_SPL_USB_HOST

diff --cc common/board_r.c
Simple merge

diff --cc common/image-fit.c
index aa9c7814620833a390de4190422194144cf4891f,f02d437539ffddbd677f45594ecb581516d8d192..5a0a0cc200727890c32ae797c2dc207681089c97
--- 1/common/image-fit.c
--- 2/common/image-fit.c
+++ b/common/image-fit.c
@@@ -1215,63 -1211,21 +1215,47 @@@ int fit_set_timestamp(void *fit, int no
   *     0, on success
   *    -1, when algo is unsupported
   */
- int calculate_hash(const void *data, int data_len, const char *algo,
+ int calculate_hash(const void *data, int data_len, const char *name,
                        uint8_t *value, int *value_len)
  {
-       if (IMAGE_ENABLE_CRC32 && strcmp(algo, "crc32") == 0) {
-               *((uint32_t *)value) = crc32_wd(0, data, data_len,
-                                                       CHUNKSZ_CRC32);
-               *((uint32_t *)value) = cpu_to_uimage(*((uint32_t *)value));
-               *value_len = 4;
-       } else if (CONFIG_IS_ENABLED(SHA1) && strcmp(algo, "sha1") == 0) {
-               sha1_csum_wd((unsigned char *)data, data_len,
-                            (unsigned char *)value, CHUNKSZ_SHA1);
-               *value_len = 20;
-       } else if (CONFIG_IS_ENABLED(SHA256) && strcmp(algo, "sha256") == 0) {
-               sha256_csum_wd((unsigned char *)data, data_len,
-                              (unsigned char *)value, CHUNKSZ_SHA256);
-               *value_len = SHA256_SUM_LEN;
-       } else if (CONFIG_IS_ENABLED(SHA384) && strcmp(algo, "sha384") == 0) {
-               sha384_csum_wd((unsigned char *)data, data_len,
-                              (unsigned char *)value, CHUNKSZ_SHA384);
-               *value_len = SHA384_SUM_LEN;
-       } else if (CONFIG_IS_ENABLED(SHA512) && strcmp(algo, "sha512") == 0) {
-               sha512_csum_wd((unsigned char *)data, data_len,
-                              (unsigned char *)value, CHUNKSZ_SHA512);
-               *value_len = SHA512_SUM_LEN;
-       } else if (IMAGE_ENABLE_MD5 && strcmp(algo, "md5") == 0) {
-               md5_wd((unsigned char *)data, data_len, value, CHUNKSZ_MD5);
-               *value_len = 16;
-       } else {
 +#if !defined(USE_HOSTCC) && defined(CONFIG_DM_HASH)
 +      int rc;
 +      enum HASH_ALGO hash_algo;
 +      struct udevice *dev;
 +
 +      rc = uclass_get_device(UCLASS_HASH, 0, &dev);
 +      if (rc) {
 +              debug("failed to get hash device, rc=%d\n", rc);
 +              return -1;
 +      }
 +
 +      hash_algo = hash_algo_lookup_by_name(algo);
 +      if (hash_algo == HASH_ALGO_INVALID) {
 +              debug("Unsupported hash algorithm\n");
 +              return -1;
 +      };
 +
 +      rc = hash_digest_wd(dev, hash_algo, data, data_len, value, CHUNKSZ);
 +      if (rc) {
 +              debug("failed to get hash value, rc=%d\n", rc);
 +              return -1;
 +      }
 +
 +      *value_len = hash_algo_digest_size(hash_algo);
 +#else
+       struct hash_algo *algo;
+       int ret;
+ 
+       ret = hash_lookup_algo(name, &algo);
+       if (ret < 0) {
                debug("Unsupported hash alogrithm\n");
                return -1;
        }
+ 
+       algo->hash_func_ws(data, data_len, value, algo->chunk_size);
+       *value_len = algo->digest_size;
 +#endif
+ 
        return 0;
  }
  

diff --cc common/spl/Kconfig
Simple merge

diff --cc configs/am335x_boneblack_vboot_defconfig
Simple merge

diff --cc configs/am335x_evm_spiboot_defconfig
Simple merge

diff --cc configs/j7200_evm_a72_defconfig
Simple merge

diff --cc configs/j7200_evm_r5_defconfig
Simple merge

diff --cc configs/j721e_evm_a72_defconfig
Simple merge

diff --cc configs/j721e_evm_r5_defconfig
Simple merge

diff --cc configs/kontron_sl28_defconfig
Simple merge

diff --cc configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index e63fd634fbafde8cbe84b99e03f04f7935deaf2f,106f8ecad5dd8ef9640dc6240827602431d52475..561a39044a8720fa1133bb1a55a0bf6c644c32ee
--- 1/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
--- 2/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@@ -41,11 -30,9 +41,9 @@@ CONFIG_ID_EEPROM=
  CONFIG_SPL_FSL_PBL=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
- CONFIG_SPL_CRYPTO=y
- CONFIG_SPL_HASH_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C=y
 -CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_SPL_MPC8XXX_INIT_DDR=y
  CONFIG_SPL_WATCHDOG=y
  CONFIG_CMD_IMLS=y
  CONFIG_CMD_GREPENV=y

diff --cc configs/ls1043ardb_nand_SECURE_BOOT_defconfig
index 6a11a7c4ad7f0c9aaf93d5537facf508cd867641,2d3fe4fb6ddc3b0b4bb778cc49184d26220a9f54..8e47f81277391469c39c89323934537015378b0c
--- 1/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
--- 2/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
@@@ -30,10 -26,8 +30,8 @@@ CONFIG_MISC_INIT_R=
  CONFIG_SPL_FSL_PBL=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0
- CONFIG_SPL_CRYPTO=y
- CONFIG_SPL_HASH_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
 -CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_SPL_MPC8XXX_INIT_DDR=y
  CONFIG_SPL_NAND_SUPPORT=y
  CONFIG_SPL_WATCHDOG=y
  CONFIG_CMD_IMLS=y

diff --cc configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
index 8934add4c8aabd6932443203b9de2e42668fa6c8,d5864180b2204d0bf64f2067525a13d63cc9428e..fef8121da7f7d56bd1ffa363de31b134228d008e
--- 1/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
--- 2/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
@@@ -30,10 -26,8 +30,8 @@@ CONFIG_MISC_INIT_R=
  CONFIG_SPL_FSL_PBL=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
- CONFIG_SPL_CRYPTO=y
- CONFIG_SPL_HASH_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
 -CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_SPL_MPC8XXX_INIT_DDR=y
  CONFIG_SPL_WATCHDOG=y
  CONFIG_CMD_IMLS=y
  CONFIG_CMD_SPL=y

diff --cc configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
index 36b91a05fb1c4e4455a4c43f6e70ed145d86bfa3,9481e0a6abb339f356600f8536037c3c89486094..c4a9315890255c09cd6a73d8df25663a6cd26319
--- 1/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
--- 2/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
@@@ -33,13 -26,10 +33,11 @@@ CONFIG_MISC_INIT_R=
  CONFIG_SPL_FSL_PBL=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
- CONFIG_SPL_CRYPTO=y
- CONFIG_SPL_HASH_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C=y
 -CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_SPL_MPC8XXX_INIT_DDR=y
  CONFIG_SPL_WATCHDOG=y
 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
  CONFIG_CMD_DM=y
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_GPT=y

diff --cc configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
index 3efea9e3ae3c82f0332d3c3de2e9f9616610c0fd,b7c72cb3baf6e74fa5182fcc587e7d723560fcd1..7301a09b4dfc71d2a0b3451c28c5edf8b2a3d634
--- 1/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
@@@ -33,13 -32,10 +33,11 @@@ CONFIG_DISPLAY_BOARDINFO_LATE=
  CONFIG_MISC_INIT_R=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8b0
- CONFIG_SPL_CRYPTO=y
- CONFIG_SPL_HASH_SUPPORT=y
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C=y
 -CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 +CONFIG_SPL_MPC8XXX_INIT_DDR=y
  CONFIG_CMD_GREPENV=y
 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
  CONFIG_CMD_MEMINFO=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_DM=y

diff --cc configs/malta64_defconfig
Simple merge

diff --cc configs/malta64el_defconfig
Simple merge

diff --cc configs/malta_defconfig
Simple merge

diff --cc configs/maltael_defconfig
Simple merge

diff --cc configs/mt8516_pumpkin_defconfig
index 693ce9a5c46c5804e6c94c452cc991043b8ec5ea,63da1eac9fd0695c5592b0085bbd0aa174882ad6..c0786bd98e385481af40f9016394873b0f07b38d
--- 1/configs/mt8516_pumpkin_defconfig
--- 2/configs/mt8516_pumpkin_defconfig
+++ b/configs/mt8516_pumpkin_defconfig
@@@ -12,9 -12,7 +12,8 @@@ CONFIG_DEBUG_UART_BASE=0x1100500
  CONFIG_DEBUG_UART_CLOCK=26000000
  # CONFIG_PSCI_RESET is not set
  CONFIG_DEBUG_UART=y
 +CONFIG_SYS_LOAD_ADDR=0x4c000000
  CONFIG_FIT=y
- # CONFIG_FIT_SHA256 is not set
  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
  CONFIG_DEFAULT_FDT_FILE="mt8516-pumpkin"
  # CONFIG_DISPLAY_BOARDINFO is not set

diff --cc configs/mvebu_db-88f3720_defconfig
Simple merge

diff --cc configs/mvebu_espressobin-88f3720_defconfig
Simple merge

diff --cc configs/mx6memcal_defconfig
Simple merge

diff --cc configs/novena_defconfig
index 81f1534926b1f6ad972d8267f7b8b36672e4da74,54180362bc10b1cfa630334b10d65e7ae4a063c1..66aa34281e9f18401422e968fce4104456e7ed89
--- 1/configs/novena_defconfig
--- 2/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@@ -67,11 -59,8 +67,10 @@@ CONFIG_PHY_MICREL_KSZ90X1=
  CONFIG_FEC_MXC=y
  CONFIG_RGMII=y
  CONFIG_MII=y
- CONFIG_PCI=y
  CONFIG_PINCTRL=y
  CONFIG_PINCTRL_IMX6=y
 +CONFIG_POWER_LEGACY=y
 +CONFIG_POWER_I2C=y
  CONFIG_MXC_UART=y
  CONFIG_DM_THERMAL=y
  CONFIG_IMX_THERMAL=y

diff --cc configs/omap3_evm_defconfig
Simple merge

diff --cc configs/qemu-riscv32_spl_defconfig
Simple merge

diff --cc configs/qemu-riscv64_spl_defconfig
Simple merge

diff --cc configs/r8a774a1_beacon_defconfig
Simple merge

diff --cc configs/r8a774b1_beacon_defconfig
Simple merge

diff --cc configs/r8a774e1_beacon_defconfig
Simple merge

diff --cc configs/sifive_unmatched_defconfig
index 7d45fbffc7220cf30130261a3e9b70bd45786a94,1dde98e0aef41c8359adaaa50455e2e946b1893a..55646550d3ad6b4f076c3484fbc4efb61fb86274
--- 1/configs/sifive_unmatched_defconfig
--- 2/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@@ -2,12 -2,12 +2,13 @@@ CONFIG_RISCV=
  CONFIG_SPL_GPIO=y
  CONFIG_SYS_MALLOC_F_LEN=0x3000
  CONFIG_NR_DRAM_BANKS=1
 +CONFIG_SYS_MALLOC_LEN=0x800000
  CONFIG_SPL_DM_SPI=y
  CONFIG_DEFAULT_DEVICE_TREE="hifive-unmatched-a00"
 -CONFIG_SPL_MMC_SUPPORT=y
 +CONFIG_SPL_MMC=y
  CONFIG_SPL=y
 -CONFIG_SPL_SPI_SUPPORT=y
 +CONFIG_SPL_SPI=y
+ CONFIG_AHCI=y
  CONFIG_TARGET_SIFIVE_UNMATCHED=y
  CONFIG_ARCH_RV64I=y
  CONFIG_RISCV_SMODE=y
@@@ -30,8 -29,9 +31,10 @@@ CONFIG_CMD_GPT_RENAME=
  CONFIG_CMD_PCI=y
  CONFIG_CMD_USB=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_SCSI_AHCI=y
+ CONFIG_AHCI_PCI=y
  CONFIG_SPL_CLK=y
 +CONFIG_SYS_I2C_EEPROM_ADDR=0x54
  CONFIG_E1000=y
  CONFIG_NVME=y
  CONFIG_PCI=y

diff --cc configs/turris_mox_defconfig
Simple merge

diff --cc configs/turris_omnia_defconfig
Simple merge

diff --cc configs/uDPU_defconfig
Simple merge

diff --cc configs/xilinx_versal_mini_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_mini_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_mini_nand_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_mini_nand_single_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_mini_qspi_defconfig
Simple merge

diff --cc configs/zynq_cse_nand_defconfig
Simple merge

diff --cc configs/zynq_cse_nor_defconfig
Simple merge

diff --cc configs/zynq_cse_qspi_defconfig
Simple merge

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

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/i2c/Makefile
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/pci/Kconfig
index 97d0de5b11d2a28e1e0bd50791f38260e7f09a67,e4123ba820f9e32506c3623b410791832778ae25..e93518ebc1049795b59930088c5766e865a400ec
--- 1/drivers/pci/Kconfig
--- 2/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@@ -55,8 -46,8 +46,7 @@@ config PCI_REGION_MULTI_ENTR
  
  config PCI_MAP_SYSTEM_MEMORY
        bool "Map local system memory from a virtual base address"
-       depends on PCI || DM_PCI
        depends on MIPS
 -      default n
        help
          Say Y if base address of system memory is being used as a virtual address
          instead of a physical address (e.g. on MIPS). The PCI core will then remap

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

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

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

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

diff --cc include/configs/MPC8560ADS.h
index 22431436643926e9a5d61cd7ebd24be0b6e77ffe,5254936a4b2646df0b72a7912d99ea5fc8b4e29f..e1e0717991d8328fe428430835619aacd97bf885
--- 1/include/configs/MPC8560ADS.h
--- 2/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@@ -27,8 -27,8 +27,7 @@@
   * assume U-Boot is less than 0.5MB
   */
  
- #define CONFIG_PCI_INDIRECT_BRIDGE
  #define CONFIG_SYS_PCI_64BIT  1       /* enable 64-bit PCI resources */
 -#undef CONFIG_ETHER_ON_FCC             /* cpm FCC ethernet support */
  #define CONFIG_RESET_PHY_R    1       /* Call reset_phy() */
  
  /*

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

diff --cc include/configs/mv-common.h
index 65d7dd1430f6f899a515dccc30e2ba5b1da5b590,6036bf4fa5d7b9c4b4b6c6a1c36c8784a8a8ca72..e460f69a08736a7769b0705675bef0ee54e3af20
--- 1/include/configs/mv-common.h
--- 2/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@@ -39,10 -39,33 +39,19 @@@
  #define CONFIG_SYS_NS16550_COM1               MV_UART_CONSOLE_BASE
  #endif
  
+ #if defined(CONFIG_ARMADA_38X) && !defined(CONFIG_SYS_BAUDRATE_TABLE)
+ #define CONFIG_SYS_BAUDRATE_TABLE     { 300, 600, 1200, 1800, 2400, 4800, \
+                                         9600, 19200, 38400, 57600, 115200, \
+                                         230400, 460800, 500000, 576000, \
+                                         921600, 1000000, 1152000, 1500000, \
+                                         2000000, 2500000, 3125000, 4000000, \
+                                         5200000 }
+ #endif
+ 
  /* auto boot */
  
 -/*
 - * For booting Linux, the board info and command line data
 - * have to be in the first 8 MB of memory, since this is
 - * the maximum mapped by the Linux kernel during initialization.
 - */
 -#define CONFIG_CMDLINE_TAG    1       /* enable passing of ATAGs  */
 -#define CONFIG_INITRD_TAG     1       /* enable INITRD tag */
 -#define CONFIG_SETUP_MEMORY_TAGS 1    /* enable memory tag */
 -
  #define       CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */
  
 -/*
 - * Size of malloc() pool
 - */
 -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024 * 4) /* 4MiB for malloc() */
 -
  /*
   * Other required minimal configurations
   */

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

diff --cc include/configs/sifive-unmatched.h
index 538cce414c641e5fcc7a0893822d3799ef3826a7,bea0eebe230685347147eedf3813bd8a76807ecc..f68d7d7676f2ea6f39c5c7ffbba50899757a7e42
--- 1/include/configs/sifive-unmatched.h
--- 2/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@@ -34,6 -38,10 +34,8 @@@
  
  #define CONFIG_SYS_PCI_64BIT          1       /* enable 64-bit resources */
  
 -#define CONFIG_SYS_CACHELINE_SIZE     64
 -
+ #define CONFIG_SYS_SCSI_MAX_SCSI_ID   4
+ 
  /* Environment options */
  
  #ifndef CONFIG_SPL_BUILD

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

diff --cc include/u-boot/md5.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
index 2d29cdad1ef1346e2ab1ab21b2120c1ed9835062,93be86c34a0195c2c0735d1bd6ebe81efd967f1c..dfe772aaff5260afd67f18b66af6fccfebedf1ce
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -87,8 -87,7 +87,8 @@@ endi
  
  ifdef CONFIG_SPL_BUILD
  obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
- obj-$(CONFIG_$(SPL_TPL_)HASH_SUPPORT) += crc16.o
+ obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16.o
 +obj-$(CONFIG_MMC_SPI_CRC_ON) += crc16.o
  obj-y += net_utils.o
  endif
  obj-$(CONFIG_ADDR_MAP) += addr_map.o

diff --cc lib/efi_loader/Kconfig
Simple merge

diff --cc lib/md5.c
Simple merge

diff --cc lib/rsa/rsa-sign.c
index 64db1429c169ab5c7729e80602ae7ecb04d33952,0e0a890fd153f2b0197492bb1b4725307aaecd21..c27a784c4298d7043801052632aeb2cd319773c7
--- 1/lib/rsa/rsa-sign.c
--- 2/lib/rsa/rsa-sign.c
+++ b/lib/rsa/rsa-sign.c
@@@ -251,10 -269,10 +251,10 @@@ static int rsa_engine_get_priv_key(cons
                        snprintf(key_id, sizeof(key_id),
                                 "%s%s",
                                 keydir, name);
-               else if (keydir)
+               else if (name)
                        snprintf(key_id, sizeof(key_id),
                                 "%s",
 -                               name);
 +                               name ? name : "");
                else if (keyfile)
                        snprintf(key_id, sizeof(key_id), "%s", keyfile);
                else

diff --cc scripts/config_whitelist.txt
index 6abb18b7aefa7b8eda7928ac23c38a7fb89d6111,ff24ab1873163518e260a44e74166c1d2628ced3..c98decb6f94105e29bfb67c15ebe2fddcf26104d
--- 1/scripts/config_whitelist.txt
--- 2/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -138,7 -166,7 +138,6 @@@ CONFIG_CLOCK
  CONFIG_CLOCK_SYNTHESIZER
  CONFIG_CM922T_XA10
  CONFIG_CMDLINE_PS_SUPPORT
--CONFIG_CMDLINE_TAG
  CONFIG_CM_INIT
  CONFIG_CM_MULTIPLE_SSRAM
  CONFIG_CM_REMAP
@@@ -635,9 -723,10 +634,8 @@@ CONFIG_IM
  CONFIG_IMX
  CONFIG_IMX6_PWM_PER_CLK
  CONFIG_IMX_HDMI
 -CONFIG_IMX_NAND
  CONFIG_IMX_VIDEO_SKIP
  CONFIG_INETSPACE_V2
--CONFIG_INITRD_TAG
  CONFIG_INIT_IGNORE_ERROR
  CONFIG_INI_ALLOW_MULTILINE
  CONFIG_INI_CASE_INSENSITIVE
@@@ -805,8 -896,8 +803,6 @@@ CONFIG_M520
  CONFIG_M5301x
  CONFIG_MACB_SEARCH_PHY
  CONFIG_MACH_OMAPL138_LCDK
--CONFIG_MACH_TYPE
--CONFIG_MACH_TYPE_COMPAT_REV
  CONFIG_MACRESET_TIMEOUT
  CONFIG_MALLOC_F_ADDR
  CONFIG_MALTA
@@@ -1094,7 -1196,7 +1090,6 @@@ CONFIG_RESET_TO_RETR
  CONFIG_RESET_VECTOR_ADDRESS
  CONFIG_RESTORE_FLASH
  CONFIG_RES_BLOCK_SIZE
--CONFIG_REVISION_TAG
  CONFIG_RMII
  CONFIG_RMSTP0_ENA
  CONFIG_RMSTP10_ENA
@@@ -1167,14 -1270,15 +1162,11 @@@ CONFIG_SERIAL_FLAS
  CONFIG_SERIAL_HW_FLOW_CONTROL
  CONFIG_SERIAL_MULTI
  CONFIG_SERIAL_SOFTWARE_FIFO
--CONFIG_SERIAL_TAG
  CONFIG_SERIRQ_CONTINUOUS_MODE
  CONFIG_SERVERIP
  CONFIG_SETUP_INITRD_TAG
--CONFIG_SETUP_MEMORY_TAGS
 -CONFIG_SET_BIST
  CONFIG_SET_BOOTARGS
  CONFIG_SET_DFU_ALT_BUF_LEN
--CONFIG_SFIO
  CONFIG_SGI_IP28
  CONFIG_SH73A0
  CONFIG_SH7751_PCI
@@@ -1197,8 -1305,10 +1189,7 @@@ CONFIG_SH_QSPI_BAS
  CONFIG_SH_SCIF_CLK_FREQ
  CONFIG_SH_SDHI_FREQ
  CONFIG_SH_SDRAM_OFFSET
--CONFIG_SIEMENS_MACH_TYPE
  CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
 -CONFIG_SKIP_LOWLEVEL_INIT
 -CONFIG_SKIP_LOWLEVEL_INIT_ONLY
  CONFIG_SKIP_TRUNOFF_WATCHDOG
  CONFIG_SLIC
  CONFIG_SLTTMR