From: Stephen Warren Date: Tue, 27 Nov 2012 23:29:13 +0000 (-0700) Subject: openrisc: use new common dtc rule X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=19fbd6b2961ccbdba73c6c731ef27da29063e094;p=openwrt%2Fstaging%2Fblogic.git 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 Cc: linux@lists.openrisc.net Signed-off-by: Stephen Warren Signed-off-by: Rob Herring --- 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/Makefile deleted file mode 100644 index 09958358601a..000000000000 --- a/arch/openrisc/boot/Makefile +++ /dev/null @@ -1,15 +0,0 @@ - - -ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""' -BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o -else -BUILTIN_DTB := -endif -obj-y += $(BUILTIN_DTB) - -clean-files := *.dtb.S - -#DTC_FLAGS ?= -p 1024 - -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) diff --git a/arch/openrisc/boot/dts/Makefile b/arch/openrisc/boot/dts/Makefile new file mode 100644 index 000000000000..b092d30d6c23 --- /dev/null +++ b/arch/openrisc/boot/dts/Makefile @@ -0,0 +1,10 @@ +ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""' +BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o +else +BUILTIN_DTB := +endif +obj-y += $(BUILTIN_DTB) + +clean-files := *.dtb.S + +#DTC_FLAGS ?= -p 1024