]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb18fa9 2d83d33)
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 3 Sep 2013 12:01:02 +0000 (14:01 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 3 Sep 2013 12:01:02 +0000 (14:01 +0200)
Conflicts:
arch/arm/include/asm/arch-zynq/hardware.h

The conflict above was trivial and solved during merge.

1  2 
arch/arm/include/asm/arch-zynq/hardware.h patch | diff1 | diff2 | blob | history
board/xilinx/zynq/board.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/include/asm/arch-zynq/hardware.h
index 081624e20160fc8ae088da5609aca7566f7a8faf,ca56d8a2dbe73c9fb79365b6e3c95474288090bc..cd69677729cbf81ad237e1ac64b8477fde37e1f3
--- 1/arch/arm/include/asm/arch-zynq/hardware.h
--- 2/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 {
diff --cc board/xilinx/zynq/board.c
Simple merge
My U-Boot fork