From: Tom Rini <trini@konsulko.com>
Date: Fri, 9 Aug 2019 11:29:20 +0000 (-0400)
Subject: Merge tag 'u-boot-rockchip-20190809' of https://gitlab.denx.de/u-boot/custodians... 
X-Git-Tag: v2019.10-rc2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21bc1935b1a84176367af982f7f8da11c29cb2eb;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge tag 'u-boot-rockchip-20190809' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip

- Add rk3399 boards Khadas Edge/-V/-Captain
- Add fully souce code support for rk3328 including TPL/DRAM init
- Enable boot from eMMC for rk3399 rock960/ficus boards
- turn on the IO supply for dw_mmc
---

21bc1935b1a84176367af982f7f8da11c29cb2eb
diff --combined arch/arm/dts/Makefile
index ad4d235,77c47d0..7c806ee
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -108,6 -108,9 +108,9 @@@ dtb-$(CONFIG_ROCKCHIP_RK3399) += 
  	rk3399-ficus.dtb \
  	rk3399-firefly.dtb \
  	rk3399-gru-bob.dtb \
+ 	rk3399-khadas-edge.dtb \
+ 	rk3399-khadas-edge-captain.dtb \
+ 	rk3399-khadas-edge-v.dtb \
  	rk3399-nanopc-t4.dtb \
  	rk3399-nanopi-m4.dtb \
  	rk3399-nanopi-neo4.dtb \
@@@ -135,8 -138,7 +138,8 @@@ dtb-$(CONFIG_ARCH_MESON) += 
  	meson-gxl-s905x-khadas-vim.dtb \
  	meson-gxm-khadas-vim2.dtb \
  	meson-axg-s400.dtb \
 -	meson-g12a-u200.dtb
 +	meson-g12a-u200.dtb \
 +	meson-g12b-odroid-n2.dtb
  dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
  	tegra20-medcom-wide.dtb \
  	tegra20-paz00.dtb \
@@@ -241,7 -243,6 +244,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
  	zynq-zybo-z7.dtb
  dtb-$(CONFIG_ARCH_ZYNQMP) += \
  	avnet-ultra96-rev1.dtb			\
 +	avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dtb	\
  	zynqmp-mini.dtb				\
  	zynqmp-mini-emmc0.dtb			\
  	zynqmp-mini-emmc1.dtb			\
@@@ -255,10 -256,10 +258,10 @@@
  	zynqmp-zcu104-revC.dtb			\
  	zynqmp-zcu106-revA.dtb			\
  	zynqmp-zcu111-revA.dtb			\
 +	zynqmp-zcu1275-revA.dtb			\
 +	zynqmp-zcu1275-revB.dtb			\
  	zynqmp-zc1232-revA.dtb			\
  	zynqmp-zc1254-revA.dtb			\
 -	zynqmp-zc1275-revA.dtb			\
 -	zynqmp-zc1275-revB.dtb			\
  	zynqmp-zc1751-xm015-dc1.dtb		\
  	zynqmp-zc1751-xm016-dc2.dtb		\
  	zynqmp-zc1751-xm017-dc3.dtb		\