summaryrefslogtreecommitdiff
path: root/dts
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-07-31 22:01:08 +0200
committerWolfgang Denk <wd@denx.de>2012-07-31 22:01:08 +0200
commitd978780b2e676c005460cd561f4f15b5220bdf49 (patch)
treebfec2a887b82f0eb552117e133f78cf44e5d7680 /dts
parentb54d1f26ff216ef08307b7652647cc92124c2be1 (diff)
parentbcec8f49d1c5570f806f9cc33eb0bcc56a6551d5 (diff)
downloadu-boot-d978780b2e676c005460cd561f4f15b5220bdf49.tar.gz
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>
Diffstat (limited to 'dts')
-rw-r--r--dts/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/dts/Makefile b/dts/Makefile
index 402dfe1dce..055b8ac599 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -36,7 +36,8 @@ $(error Your architecture does not have device tree support enabled. \
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)