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

Xilinx fixes for v2017.03

- defconfig alignment
- Topic.nl board updates
- Minor microblaze comment fix

diff --cc configs/microblaze-generic_defconfig
Simple merge

diff --cc configs/topic_miami_defconfig
index e3e9ba2558764e326696d60f1b149cbd3b863023,fc0120e4b41cb217164e253967c44476ee5afa5d..9464ea8a0df8f70db4cbb8abc7ca14880dcc67ec
--- 1/configs/topic_miami_defconfig
--- 2/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@@ -2,10 -2,11 +2,10 @@@ CONFIG_ARM=
  CONFIG_SYS_VENDOR="topic"
  CONFIG_SYS_CONFIG_NAME="topic_miami"
  CONFIG_ARCH_ZYNQ=y
- CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miami/ps7_regs.txt"
  CONFIG_SYS_TEXT_BASE=0x4000000
+ CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miami/ps7_regs.txt"
  CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miami"
  CONFIG_BOOTDELAY=0
 -CONFIG_SYS_NO_FLASH=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y

diff --cc configs/topic_miamiplus_defconfig
index 0c9a3d0379beafb7ffd90a9472c613879ae731e4,a51fad12b82d64bae8ba74751172c998dbee8341..10762f84e16064cab2b8ec63aa7409793e8864bf
--- 1/configs/topic_miamiplus_defconfig
--- 2/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@@ -2,10 -2,11 +2,10 @@@ CONFIG_ARM=
  CONFIG_SYS_VENDOR="topic"
  CONFIG_SYS_CONFIG_NAME="topic_miamiplus"
  CONFIG_ARCH_ZYNQ=y
- CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
  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_BOOTDELAY=0
 -CONFIG_SYS_NO_FLASH=y
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SPL=y
  CONFIG_HUSH_PARSER=y

diff --cc configs/zynq_microzed_defconfig
Simple merge

diff --cc configs/zynq_picozed_defconfig
Simple merge

diff --cc configs/zynq_zc702_defconfig
Simple merge

diff --cc configs/zynq_zc706_defconfig
Simple merge

diff --cc configs/zynq_zc770_xm010_defconfig
Simple merge

diff --cc configs/zynq_zed_defconfig
Simple merge

diff --cc configs/zynq_zybo_defconfig
Simple merge