diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-07-24 10:09:19 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-02 18:29:32 -0400 |
| commit | c8391a0e926feeb55e3d9087e74f9d39b1f4ae21 (patch) | |
| tree | 367fec588e73270c78fe353e1b430bec65f5231e | |
| parent | cc4f427bbd7192b602310ee27ee34e3bfe81608b (diff) | |
| download | u-boot-imx-c8391a0e926feeb55e3d9087e74f9d39b1f4ae21.zip u-boot-imx-c8391a0e926feeb55e3d9087e74f9d39b1f4ae21.tar.gz u-boot-imx-c8391a0e926feeb55e3d9087e74f9d39b1f4ae21.tar.bz2 | |
dts/Makefile: unify cpp/dtc include paths
*.dts may use #include (via cpp) or /include/ (via dtc; assuming a newer
dtc). The choice is up to the creator of the DT. Create a common variable
DTC_INCDIRS that lists the paths searched by include statements, and
update cpp and dtc invocation to use them.
For cpp, also specify -nostdinc to ensure the same set of paths is
available to both type of include statement.
For dtc, create a new DTC_FLAGS variable to hold all the flags passed to
dtc.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | dts/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/dts/Makefile b/dts/Makefile index edaa65e..4eb5a05 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -21,11 +21,18 @@ $(if $(CONFIG_ARCH_DEVICE_TREE),,\ $(error Your architecture does not have device tree support enabled. \ Please define CONFIG_ARCH_DEVICE_TREE)) +DTS_INCDIRS = $(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts +DTS_INCDIRS += $(SRCTREE)/board/$(VENDOR)/dts +DTS_INCDIRS += $(SRCTREE)/arch/$(ARCH)/dts + # We preprocess the device tree file provide a useful define DTS_CPPFLAGS := -x assembler-with-cpp \ -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \ -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" \ - -I$(SRCTREE)/board/$(VENDOR)/dts -I$(SRCTREE)/arch/$(ARCH)/dts + -nostdinc $(addprefix -I,$(DTS_INCDIRS)) + +DTC_FLAGS := -R 4 -p 0x1000 \ + $(addprefix -i ,$(DTS_INCDIRS)) all: $(obj).depend $(LIB) @@ -36,7 +43,7 @@ DT_BIN := $(obj)dt.dtb $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts $(CPP) -P $(DTS_CPPFLAGS) $< -o $(DT_BIN).dts.tmp - $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} $(DT_BIN).dts.tmp + $(DTC) $(DTC_FLAGS) -O dtb -o ${DT_BIN} $(DT_BIN).dts.tmp process_lds = \ $(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p' |