From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 3 Sep 2013 12:01:02 +0000 (+0200)
Subject: Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
X-Git-Tag: v2013.10-rc3~8^2~8
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=6d4511b2c6734842de9de21c1bc0db4c3ea28b72

Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

Conflicts:
	arch/arm/include/asm/arch-zynq/hardware.h

The conflict above was trivial and solved during merge.
---

6d4511b2c6734842de9de21c1bc0db4c3ea28b72
diff --cc arch/arm/include/asm/arch-zynq/hardware.h
index 081624e201,ca56d8a2db..cd69677729
--- a/arch/arm/include/asm/arch-zynq/hardware.h
+++ b/arch/arm/include/asm/arch-zynq/hardware.h
@@@ -17,8 -17,7 +17,9 @@@
  #define ZYNQ_SDHCI_BASEADDR1		0xE0101000
  #define ZYNQ_I2C_BASEADDR0		0xE0004000
  #define ZYNQ_I2C_BASEADDR1		0xE0005000
 +#define ZYNQ_SPI_BASEADDR0		0xE0006000
 +#define ZYNQ_SPI_BASEADDR1		0xE0007000
+ #define ZYNQ_DDRC_BASEADDR		0xF8006000
  
  /* Reflect slcr offsets */
  struct slcr_regs {