From: Stephen Warren <swarren@xxxxxxxxxx> The current rules have the .dtb files build in a different directory from the .dts files. This patch changes xtensa to use the generic dtb rule which builds .dtb files in the same directory as the source .dts. This requires moving parts of arch/xtensa/boot/Makefile into newly created arch/xtensa/boot/dts/Makefile, and updating arch/xtensa/Makefile to call the new Makefile. Cc: Chris Zankel <chris@xxxxxxxxxx> Cc: Max Filippov <jcmvbkbc@xxxxxxxxx> Cc: linux-xtensa@xxxxxxxxxxxxxxxx Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx> --- v7: New patch. --- arch/xtensa/Makefile | 4 ++-- arch/xtensa/boot/Makefile | 10 ---------- arch/xtensa/boot/dts/Makefile | 13 +++++++++++++ 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 arch/xtensa/boot/dts/Makefile diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index b8eb819..b0646fd 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -80,7 +80,7 @@ core-y += $(buildvar) $(buildplf) libs-y += arch/xtensa/lib/ $(LIBGCC) -core-$(CONFIG_BUILTIN_DTB_BOOL) += arch/xtensa/boot/ +core-$(CONFIG_BUILTIN_DTB_BOOL) += arch/xtensa/boot/dts/ boot := arch/xtensa/boot @@ -92,7 +92,7 @@ zImage: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ %.dtb: - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ define archhelp @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)' diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 5d21c21..6be27fb 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile @@ -25,16 +25,6 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot bootdir-$(CONFIG_XTENSA_PLATFORM_XTAVNET)+= boot-redboot boot-elf boot-uboot - -BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o -obj-$(CONFIG_BUILTIN_DTB_BOOL) += $(BUILTIN_DTB) - -# Rule to build device tree blobs -$(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - -clean-files := *.dtb.S - zImage Image: $(bootdir-y) $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \ diff --git a/arch/xtensa/boot/dts/Makefile b/arch/xtensa/boot/dts/Makefile new file mode 100644 index 0000000..0b5581a --- /dev/null +++ b/arch/xtensa/boot/dts/Makefile @@ -0,0 +1,13 @@ +# +# arch/xtensa/boot/dts/Makefile +# +# This file is subject to the terms and conditions of the GNU General Public +# License. See the file "COPYING" in the main directory of this archive +# for more details. +# +# + +BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o +obj-$(CONFIG_BUILTIN_DTB_BOOL) += $(BUILTIN_DTB) + +clean-files := *.dtb.S -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
