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

diff --combined arch/arm/Kconfig
index 2167e29f6aba525f61f92635f1017e8699232668,48700206f826dbfc594b641541c5b09ad4969dce..00be305c390c796063198c9fbc2fb0f7a72faaac
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -535,11 -535,6 +535,11 @@@ config TARGET_MX6SABRES
        select DM
        select DM_THERMAL
  
 +config TARGET_MX6CUBOXI
 +      bool "Support Solid-run mx6 boards"
 +      select CPU_V7
 +      select SUPPORT_SPL
 +
  config TARGET_MX6SLEVK
        bool "Support mx6slevk"
        select CPU_V7
@@@ -649,7 -644,7 +649,7 @@@ config TARGET_COLIBRI_V
        bool "Support Colibri VF50/61"
        select CPU_V7
  
- config ZYNQ
+ config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
@@@ -837,7 -832,7 +837,7 @@@ source "arch/arm/mach-uniphier/Kconfig
  
  source "arch/arm/mach-versatile/Kconfig"
  
- source "arch/arm/cpu/armv7/zynq/Kconfig"
+ source "arch/arm/mach-zynq/Kconfig"
  
  source "arch/arm/cpu/armv7/Kconfig"
  
@@@ -927,7 -922,6 +927,7 @@@ source "board/siemens/draco/Kconfig
  source "board/siemens/pxm2/Kconfig"
  source "board/siemens/rut/Kconfig"
  source "board/silica/pengwyn/Kconfig"
 +source "board/solidrun/mx6cuboxi/Kconfig"
  source "board/solidrun/hummingboard/Kconfig"
  source "board/spear/spear300/Kconfig"
  source "board/spear/spear310/Kconfig"

diff --combined arch/arm/cpu/armv7/Makefile
index e6249f13c8d9af906b26af97f00e295f5bb008cd,3c991e152d311a62c6dbe1087b19fb40a085529f..fcccd0c9ba6c9ed91bc0ed5f91cc7e1527a349bb
--- 1/arch/arm/cpu/armv7/Makefile
--- 2/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@@ -12,7 -12,7 +12,7 @@@ obj-y += cache_v7.
  obj-y += cpu.o cp15.o
  obj-y += syslib.o
  
 -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI),)
 +ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$(CONFIG_SOCFPGA),)
  ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
  obj-y += lowlevel_init.o
  endif
@@@ -56,4 -56,3 +56,3 @@@ obj-$(if $(filter stv0991,$(SOC)),y) +
  obj-$(CONFIG_ARCH_SUNXI) += sunxi/
  obj-$(CONFIG_U8500) += u8500/
  obj-$(CONFIG_VF610) += vf610/
- obj-$(CONFIG_ZYNQ) += zynq/