summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Linz <linz@li-pro.net>2012-07-04 22:25:29 +0200
committerMichal Simek <monstr@monstr.eu>2012-07-10 10:00:45 +0200
commita1d2478e2d5011bed3e085033f11427fb1423efb (patch)
tree275c3e058d1e31e4323057c34e56c3f9f16443ea
parent2e65b44c0fcac0db608493b86e30b02e8ebafb61 (diff)
downloadu-boot-imx-a1d2478e2d5011bed3e085033f11427fb1423efb.zip
u-boot-imx-a1d2478e2d5011bed3e085033f11427fb1423efb.tar.gz
u-boot-imx-a1d2478e2d5011bed3e085033f11427fb1423efb.tar.bz2
fdt: Add board specific dts inclusion
Some architectures, for example Microblaze, doesn't need a splitted device tree because every Microblaze hw design is different. The individuell Microblaze device tree will be auto generated by FPGA design tools and could be used directly with dtc. The auto generated dts for Microblaze can not processed by CPP. Unfortunately that is the default procedure in U-Boot to merge a splitted device tree (substitution of ARCH_CPU_DTS). Microblaze will never use the ARCH_CPU_DTS substitution and we introduce the new board specific substitution variable BOARD_DTS that points into vendor/board/dts subdir with the file name of CONFIG_DEFAULT_DEVICE_TREE. The common dts file in vendor/dts subdir (defined by CONFIG_DEFAULT_DEVICE_TREE) contain a single include line that can processed by CPP: /include/ BOARD_DTS Signed-off-by: Stephan Linz <linz@li-pro.net> Tested-by: Michal Simek <monstr@monstr.eu> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--dts/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/dts/Makefile b/dts/Makefile
index 914e479..b1f47a1 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)