diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-27 16:29:13 -0700 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-12-03 17:17:48 -0600 |
| commit | 19fbd6b2961ccbdba73c6c731ef27da29063e094 (patch) | |
| tree | cc828e338279844581f56845b22adee2c0ce2aa4 | |
| parent | 70f915a299bc72424fc2d3498284f6d48b880afa (diff) | |
openrisc: use new common dtc rule
The current rules have the .dtb files build in a different directory
from the .dts files. This patch changes openrisc to use the generic dtb
rule which builds .dtb files in the same directory as the source .dts.
This requires renaming arch/openrisc/boot/Makefile to
arch/openrisc/boot/dts/Makefile, and updating arch/openrisc/Makefile to
call the new Makefile.
Cc: Jonas Bonn <jonas@southpole.se>
Cc: linux@lists.openrisc.net
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| -rw-r--r-- | arch/openrisc/Makefile | 2 | ||||
| -rw-r--r-- | arch/openrisc/boot/dts/Makefile (renamed from arch/openrisc/boot/Makefile) | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/openrisc/Makefile b/arch/openrisc/Makefile index 966886c8daf5..4739b8302a58 100644 --- a/arch/openrisc/Makefile +++ b/arch/openrisc/Makefile @@ -50,6 +50,6 @@ BUILTIN_DTB := y else BUILTIN_DTB := n endif -core-$(BUILTIN_DTB) += arch/openrisc/boot/ +core-$(BUILTIN_DTB) += arch/openrisc/boot/dts/ all: vmlinux diff --git a/arch/openrisc/boot/Makefile b/arch/openrisc/boot/dts/Makefile index 09958358601a..b092d30d6c23 100644 --- a/arch/openrisc/boot/Makefile +++ b/arch/openrisc/boot/dts/Makefile @@ -1,5 +1,3 @@ - - ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""' BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o else @@ -10,6 +8,3 @@ obj-y += $(BUILTIN_DTB) clean-files := *.dtb.S #DTC_FLAGS ?= -p 1024 - -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) |