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>

diff --combined drivers/spi/Makefile
index c20f1f2daac922878626c430e37c2d161d08f23a,3ae38e59070f89d00575d33cc15611d47220cf6d..cd3f9fa856d224473429fe2501ec53183ca5e12b
--- 1/drivers/spi/Makefile
--- 2/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)

diff --combined dts/Makefile
index 402dfe1dced33d2c3087791947420626557aba34,b1f47a19103f5f43f759fb36b74850240b483545..055b8ac599ad1355f049f58265b57d4709005600
--- 1/dts/Makefile
--- 2/dts/Makefile
+++ b/dts/Makefile
@@@ -36,7 -36,8 +36,8 @@@ $(error Your architecture does not hav
  Please define CONFIG_ARCH_DEVICE_TREE))
  
  # We preprocess the device tree file provide a useful define
- DTS_CPPFLAGS := -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\"
+ DTS_CPPFLAGS := -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \
+               -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\"
  
  all:  $(obj).depend $(LIB)
  
@@@ -51,7 -52,7 +52,7 @@@ $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dt
                { { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
                    echo $$? >&3 ; } | \
                  grep -v '^DTC: dts->dtb  on file' ; \
 -              } 3>&1 ) ; \
 +              } 3>&1 1>&2 ) ; \
        exit $$rc
  
  process_lds = \