From: Tom Rini <trini@konsulko.com>
Date: Fri, 19 Jun 2020 20:25:50 +0000 (-0400)
Subject: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi into next
X-Git-Tag: v2020.10~139^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5575f79bdaa824a90747d5a3d063b5219521b066;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi into next

- Convert fsl_espi to driver model (Chuanhua)
- Enable am335x baltos to DM_SPI (Jagan)
- Drop few powerpc board which doesn't have DM enabled (Jagan)
---

5575f79bdaa824a90747d5a3d063b5219521b066
diff --combined Kconfig
index 34a88ebe,8f3fba0..6d45534
--- a/Kconfig
+++ b/Kconfig
@@@ -146,7 -146,7 +146,7 @@@ config SYS_MALLOC_F_LE
  	default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
  			   ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
  			   ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \
- 			   ARCH_LS1046A)
+ 			   ARCH_LS1046A || ARCH_QEMU)
  	default 0x400
  	help
  	  Before relocation, memory is very limited on many platforms. Still,
@@@ -358,26 -358,12 +358,26 @@@ config FIT_ENABLE_SHA256_SUPPOR
  	help
  	  Enable this to support SHA256 checksum of FIT image contents. A
  	  SHA256 checksum is a 256-bit (32-byte) hash value used to check that
 -	  the image contents have not been corrupted. SHA256 is recommended
 -	  for use in secure applications since (as at 2016) there is no known
 -	  feasible attack that could produce a 'collision' with differing
 -	  input data. Use this for the highest security. Note that only the
 -	  SHA256 variant is supported: SHA512 and others are not currently
 -	  supported in U-Boot.
 +	  the image contents have not been corrupted.
 +
 +config FIT_ENABLE_SHA384_SUPPORT
 +	bool "Support SHA384 checksum of FIT image contents"
 +	default n
 +	select SHA384
 +	help
 +	  Enable this to support SHA384 checksum of FIT image contents. A
 +	  SHA384 checksum is a 384-bit (48-byte) hash value used to check that
 +	  the image contents have not been corrupted. Use this for the highest
 +	  security.
 +
 +config FIT_ENABLE_SHA512_SUPPORT
 +	bool "Support SHA512 checksum of FIT image contents"
 +	default n
 +	select SHA512
 +	help
 +	  Enable this to support SHA512 checksum of FIT image contents. A
 +	  SHA512 checksum is a 512-bit (64-byte) hash value used to check that
 +	  the image contents have not been corrupted.
  
  config FIT_SIGNATURE
  	bool "Enable signature verification of FIT uImages"
diff --combined MAINTAINERS
index 02971c2,00985c0..7bd9d8a
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -698,7 -698,6 +698,7 @@@ S:	Maintaine
  T:	git https://gitlab.denx.de/u-boot/u-boot.git
  F:	common/log*
  F:	cmd/log.c
 +F:	doc/develop/logging.rst
  F:	test/log/
  F:	test/py/tests/test_log.py
  
@@@ -878,6 -877,7 +878,7 @@@ M:	Sughosh Ganu <sughosh.ganu@linaro.or
  R:	Heinrich Schuchardt <xypron.glpk@gmx.de>
  S:	Maintained
  F:	cmd/rng.c
+ F:	doc/api/rng.rst
  F:	drivers/rng/
  F:	drivers/virtio/virtio_rng.c
  F:	include/rng.h
diff --combined configs/k2g_evm_defconfig
index 0379021,fb8fb25..e2a4519
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@@ -34,6 -34,7 +34,7 @@@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_na
  CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)"
  CONFIG_CMD_UBI=y
  CONFIG_OF_CONTROL=y
+ CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm"
  CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice"
  CONFIG_DTB_RESELECT=y
@@@ -41,6 -42,7 +42,7 @@@ CONFIG_MULTI_DTB_FIT=
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_DM=y
+ CONFIG_SPL_DM=y
  CONFIG_DFU_MMC=y
  CONFIG_SYS_I2C_DAVINCI=y
  CONFIG_MISC=y
@@@ -58,7 -60,7 +60,7 @@@ CONFIG_PHYLIB=
  CONFIG_PHY_MARVELL=y
  CONFIG_PHY_MICREL=y
  CONFIG_PHY_MICREL_KSZ8XXX=y
 -CONFIG_PHY_TI=y
 +CONFIG_PHY_TI_DP83867=y
  CONFIG_DM_ETH=y
  CONFIG_MII=y
  CONFIG_DRIVER_TI_KEYSTONE_NET=y