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

diff --combined arch/arm/dts/Makefile
index c97e3f6bc733345f6c733265cc67b173d3dcf1b4,1c3b705b6f123c1aa81debceb924b69454a644c1..7e2108312be641dd818596772642a3c71498c4b2
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -31,9 -31,7 +31,9 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3288-firefly.dtb \
        rk3288-jerry.dtb \
        rk3288-rock2-square.dtb \
 -      rk3036-sdk.dtb
 +      rk3288-evb.dtb \
 +      rk3036-sdk.dtb \
 +      rk3399-evb.dtb
  dtb-$(CONFIG_ARCH_MESON) += \
        meson-gxbb-odroidc2.dtb
  dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
@@@ -248,6 -246,7 +248,7 @@@ dtb-$(CONFIG_MACH_SUN8I_H3) += 
        sun8i-h3-orangepi-lite.dtb \
        sun8i-h3-orangepi-one.dtb \
        sun8i-h3-orangepi-pc.dtb \
+       sun8i-h3-orangepi-pc-plus.dtb \
        sun8i-h3-orangepi-plus.dtb
  dtb-$(CONFIG_MACH_SUN50I) += \
        sun50i-a64-pine64-plus.dtb \