From: Tom Rini <trini@konsulko.com>
Date: Mon, 13 Feb 2017 14:35:40 +0000 (-0500)
Subject: Merge tag 'xilinx-fixes-for-v2017.03' of git://www.denx.de/git/u-boot-microblaze
X-Git-Tag: v2017.03-rc2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8d052b5004b3180b9d28567922acd1b62f9cb15;p=oweals%2Fu-boot.git

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

Xilinx fixes for v2017.03

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

a8d052b5004b3180b9d28567922acd1b62f9cb15
diff --cc configs/topic_miami_defconfig
index e3e9ba2558,fc0120e4b4..9464ea8a0d
--- a/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 0c9a3d0379,a51fad12b8..10762f84e1
--- a/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