Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

diff --combined arch/arm/dts/Makefile
index b946abe,8977d4b..ba6dec9
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -34,14 -34,13 +34,15 @@@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.
  dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
        zynq-zc706.dtb \
        zynq-zed.dtb \
+       zynq-zybo.dtb \
        zynq-microzed.dtb \
        zynq-zc770-xm010.dtb \
        zynq-zc770-xm012.dtb \
        zynq-zc770-xm013.dtb
  dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb
  
 +dtb-$(CONFIG_SOCFPGA) += socfpga_cyclone5_socrates.dtb
 +
  targets += $(dtb-y)
  
  DTC_FLAGS += -R 4 -p 0x1000