Merge tag 'xilinx-for-v2017.09' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Fri, 4 Aug 2017 11:23:32 +0000 (07:23 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 4 Aug 2017 11:23:32 +0000 (07:23 -0400)
Xilinx changes for v2017.09

Zynq:
- Add Z-Turn board support

fpga:
- Remove intermediate buffer from code

Zynqmp:
- dts cleanup
- change psu_init handling
- Add options to get silicon version
- Fix time handling
- Map OCM/TCM via MMU
- Add new clock driver

1  2 
arch/arm/dts/Makefile

diff --combined arch/arm/dts/Makefile
@@@ -132,13 -132,14 +132,14 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.d
        zynq-topic-miami.dtb \
        zynq-topic-miamilite.dtb \
        zynq-topic-miamiplus.dtb \
+       zynq-zturn-myir.dtb \
        zynq-zc770-xm010.dtb \
        zynq-zc770-xm011.dtb \
        zynq-zc770-xm012.dtb \
        zynq-zc770-xm013.dtb
  dtb-$(CONFIG_ARCH_ZYNQMP) += \
        zynqmp-ep108.dtb                        \
-       zynqmp-zcu102.dtb                       \
+       zynqmp-zcu102-revA.dtb                  \
        zynqmp-zcu102-revB.dtb                  \
        zynqmp-zc1751-xm015-dc1.dtb             \
        zynqmp-zc1751-xm016-dc2.dtb             \
@@@ -370,12 -371,6 +371,12 @@@ dtb-$(CONFIG_MX7) += imx7-colibri.dtb 
  
  dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
  
 +dtb-$(CONFIG_RCAR_GEN3) += \
 +      r8a7795-h3ulcb.dtb \
 +      r8a7795-salvator-x.dtb \
 +      r8a7796-m3ulcb.dtb \
 +      r8a7796-salvator-x.dtb
 +
  dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
        keystone-k2l-evm.dtb \
        keystone-k2e-evm.dtb \