Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

Xilinx changes for v2017.07

ZynqMP:
- config cleanup
- SD LS mode support
- psu_init* cleanup
- unmap OCM
- Support for SMC

Zynq:
- add ddrc to Kconfig
- add topic-miamilite board support

diff --combined arch/arm/dts/Makefile
index 7b405e5,dd6d1da..a01c9b6
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -127,6 -127,7 +127,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.d
        zynq-microzed.dtb \
        zynq-picozed.dtb \
        zynq-topic-miami.dtb \
+       zynq-topic-miamilite.dtb \
        zynq-topic-miamiplus.dtb \
        zynq-zc770-xm010.dtb \
        zynq-zc770-xm011.dtb \
@@@ -316,7 -317,6 +317,7 @@@ dtb-$(CONFIG_MACH_SUN8I_H3) += 
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
        sun8i-h3-nanopi-m1.dtb \
 +      sun8i-h3-nanopi-m1-plus.dtb \
        sun8i-h3-nanopi-neo.dtb \
        sun8i-h3-nanopi-neo-air.dtb
  dtb-$(CONFIG_MACH_SUN8I_R40) += \
@@@ -324,13 -324,10 +325,13 @@@
  dtb-$(CONFIG_MACH_SUN8I_V3S) += \
        sun8i-v3s-licheepi-zero.dtb
  dtb-$(CONFIG_MACH_SUN50I_H5) += \
 +      sun50i-h5-nanopi-neo2.dtb \
        sun50i-h5-orangepi-pc2.dtb \
 -      sun50i-h5-orangepi-prime.dtb
 +      sun50i-h5-orangepi-prime.dtb \
 +      sun50i-h5-orangepi-zero-plus2.dtb
  dtb-$(CONFIG_MACH_SUN50I) += \
        sun50i-a64-bananapi-m64.dtb \
 +      sun50i-a64-orangepi-win.dtb \
        sun50i-a64-pine64-plus.dtb \
        sun50i-a64-pine64.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
@@@ -393,7 -390,7 +394,7 @@@ dtb-$(CONFIG_TARGET_AT91SAM9N12EK) += a
  
  dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \
        logicpd-torpedo-37xx-devkit.dtb \
 -      logicpd-som-lv-37xx-devkit.dts
 +      logicpd-som-lv-37xx-devkit.dtb
  
  dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \
        at91-sama5d2_xplained.dtb

diff --combined configs/topic_miamiplus_defconfig
index 923b991,535ce6d..f49cbcb
--- 1/configs/topic_miamiplus_defconfig
--- 2/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@@ -1,11 -1,10 +1,11 @@@
  CONFIG_ARM=y
  CONFIG_SYS_VENDOR="topic"
- CONFIG_SYS_CONFIG_NAME="topic_miamiplus"
+ CONFIG_SYS_CONFIG_NAME="topic_miami"
  CONFIG_ARCH_ZYNQ=y
  CONFIG_SYS_TEXT_BASE=0x4000000
  CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
  CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamiplus"
 +CONFIG_DEBUG_UART=y
  CONFIG_BOOTDELAY=0
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SPL=y
@@@ -29,11 -28,13 +29,12 @@@ CONFIG_SPL_DM_SEQ_ALIAS=
  CONFIG_DFU_RAM=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ZYNQ=y
+ CONFIG_SF_DUAL_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_BAR=y
  CONFIG_SPI_FLASH_STMICRO=y
  # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
  # CONFIG_NETDEVICES is not set
 -CONFIG_DEBUG_UART=y
  CONFIG_DEBUG_UART_ZYNQ=y
  CONFIG_DEBUG_UART_BASE=0xe0000000
  CONFIG_DEBUG_UART_CLOCK=100000000