From: Wolfgang Denk <wd@denx.de>
Date: Tue, 31 Jul 2012 20:01:08 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-microblaze
X-Git-Tag: v2012.10-rc1~416
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d978780b2e676c005460cd561f4f15b5220bdf49;p=kernel%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-microblaze:
  microblaze: Wire up SPI driver
  spi: microblaze: Adds driver for Xilinx SPI controller
  microblaze: intc: Clear interrupt code
  microblaze: Call serial multi initialization
  microblaze: Move __udelay implementation
  microblaze: Remove extern from board.c
  microblaze: Wire up dts configuration
  fdt: Add board specific dts inclusion
  microblaze: Move individual board linker scripts to common script in cpu tree.
  microblaze: Add gpio.h
  microblaze: Add missing undefs for UBI and UBIFS
  microblaze: Expand and correct configuration comments
  microblaze: Enable ubi support
  microblaze: Avoid compile error on systems without cfi flash
  microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION

Conflicts:
	drivers/spi/Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

d978780b2e676c005460cd561f4f15b5220bdf49
diff --cc drivers/spi/Makefile
index c20f1f2,3ae38e5..cd3f9fa
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -43,7 -43,8 +43,9 @@@ COBJS-$(CONFIG_OMAP3_SPI) += omap3_spi.
  COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
  COBJS-$(CONFIG_SH_SPI) += sh_spi.o
  COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o
 +COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o
+ COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o
+ COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o
  
  COBJS	:= $(COBJS-y)
  SRCS	:= $(COBJS:.o=.c)