Merge branch 'next'

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-mediatek/mt7622/init.c
Simple merge

diff --cc board/beagle/beagleplay/Kconfig
Simple merge

diff --cc board/google/veyron/veyron.c
Simple merge

diff --cc common/spl/spl_atf.c
Simple merge

diff --cc configs/chromebook_link_defconfig
index 1a72fd1,a9f91dd..70c57ae
--- 1/configs/chromebook_link_defconfig
--- 2/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@@ -80,5 -78,5 +80,6 @@@ CONFIG_FRAMEBUFFER_VESA_MODE_11A=
  CONFIG_VIDEO_IVYBRIDGE_IGD=y
  CONFIG_CMD_DHRYSTONE=y
  CONFIG_TPM=y
++# CONFIG_SHA256 is not set
  # CONFIG_GZIP is not set
  # CONFIG_EFI_LOADER is not set

diff --cc configs/hmibsc_defconfig
Simple merge

diff --cc configs/imx8mp_dhcom_pdk3_defconfig
Simple merge

diff --cc configs/phycore-imx8mp_defconfig
index afd9cad,7b16e8e..57e320a
--- 1/configs/phycore-imx8mp_defconfig
--- 2/configs/phycore-imx8mp_defconfig
+++ b/configs/phycore-imx8mp_defconfig
@@@ -10,9 -9,10 +10,9 @@@ CONFIG_ENV_SIZE=0x1000
  CONFIG_ENV_OFFSET=0x3C0000
  CONFIG_SYS_I2C_MXC_I2C1=y
  CONFIG_DM_GPIO=y
- CONFIG_DEFAULT_DEVICE_TREE="imx8mp-phyboard-pollux-rdk"
+ CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mp-phyboard-pollux-rdk"
  CONFIG_SPL_TEXT_BASE=0x920000
  CONFIG_TARGET_PHYCORE_IMX8MP=y
 -CONFIG_PHYTEC_SOM_DETECTION=y
  CONFIG_SYS_MONITOR_LEN=524288
  CONFIG_SPL_MMC=y
  CONFIG_SPL_SERIAL=y

diff --cc drivers/power/regulator/regulator-uclass.c
Simple merge