Merge branch 'master' of git://git.denx.de/u-boot-sunxi

diff --combined arch/arm/dts/Makefile
index 69f852012e0babf068d6f22637a8906a81472090,3efa3b99b96f99063424d62ce643f14ad410f1bb..790571b7730c60e675582154a266143117f355ad
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -130,7 -130,6 +130,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
        zynq-cc108.dtb \
        zynq-cse-qspi-single.dtb \
        zynq-microzed.dtb \
 +      zynq-minized.dtb \
        zynq-picozed.dtb \
        zynq-syzygy-hub.dtb \
        zynq-topic-miami.dtb \
@@@ -382,6 -381,7 +382,7 @@@ dtb-$(CONFIG_MACH_SUN50I_H5) += 
        sun50i-h5-orangepi-prime.dtb \
        sun50i-h5-orangepi-zero-plus2.dtb
  dtb-$(CONFIG_MACH_SUN50I) += \
+       sun50i-a64-amarula-relic.dtb \
        sun50i-a64-bananapi-m64.dtb \
        sun50i-a64-nanopi-a64.dtb \
        sun50i-a64-olinuxino.dtb \
@@@ -440,7 -440,6 +441,7 @@@ dtb-$(CONFIG_RCAR_GEN3) += 
        r8a7796-salvator-x.dtb \
        r8a77965-salvator-x.dtb \
        r8a77970-eagle.dtb \
 +      r8a77990-ebisu.dtb \
        r8a77995-draak.dtb
  
  dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \

diff --combined drivers/Kconfig
index 8424898dbdc6226c645a2436c10c90c8370fe455,9af883528d72cdc8514c75b734db258252ffe572..9e21b28750c3dbbcd8d948a9aa30e9de125040c7
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -28,8 -28,6 +28,8 @@@ source "drivers/dfu/Kconfig
  
  source "drivers/dma/Kconfig"
  
 +source "drivers/fastboot/Kconfig"
 +
  source "drivers/firmware/Kconfig"
  
  source "drivers/fpga/Kconfig"
@@@ -62,6 -60,8 +62,8 @@@ source "drivers/pcmcia/Kconfig
  
  source "drivers/phy/Kconfig"
  
+ source "drivers/phy/allwinner/Kconfig"
+ 
  source "drivers/phy/marvell/Kconfig"
  
  source "drivers/pinctrl/Kconfig"

diff --combined drivers/Makefile
index d29a6e467b6c5d121d3b73152b7d3314e2af898a,85e4e0ca076c36b3a830e250993ac60e3f038699..a213ea96718981a69eecfb1c3d0e3d4de456353d
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -71,7 -71,6 +71,7 @@@ obj-y += block
  obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
  obj-$(CONFIG_CPU) += cpu/
  obj-y += crypto/
 +obj-$(CONFIG_FASTBOOT) += fastboot/
  obj-y += firmware/
  obj-$(CONFIG_FPGA) += fpga/
  obj-y += misc/
@@@ -80,6 -79,7 +80,7 @@@ obj-$(CONFIG_NVME) += nvme
  obj-y += pcmcia/
  obj-y += dfu/
  obj-$(CONFIG_X86) += pch/
+ obj-y += phy/allwinner/
  obj-y += phy/marvell/
  obj-y += rtc/
  obj-y += scsi/