Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: use new common dtc rule

The current rules have the .dtb files build in a different directory
from the .dts files. This patch changes arm64 to use the generic dtb
rule which builds .dtb files in the same directory as the source .dts.

This requires moving parts of arch/arm64/boot/Makefile into newly created
arch/arm64/boot/dts/Makefile, and updating arch/arm64/Makefile to call the
new Makefile.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>

authored by

Stephen Warren and committed by
Rob Herring
da4cbc6d 499cd829

+6 -6
+1 -1
arch/arm64/Makefile
··· 54 54 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ 55 55 56 56 %.dtb: 57 - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ 57 + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ 58 58 59 59 # We use MRPROPER_FILES and CLEAN_FILES now 60 60 archclean:
-5
arch/arm64/boot/Makefile
··· 22 22 $(obj)/Image.gz: $(obj)/Image FORCE 23 23 $(call if_changed,gzip) 24 24 25 - $(obj)/%.dtb: $(src)/dts/%.dts 26 - $(call cmd,dtc) 27 - 28 25 install: $(obj)/Image 29 26 $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ 30 27 $(obj)/Image System.map "$(INSTALL_PATH)" ··· 29 32 zinstall: $(obj)/Image.gz 30 33 $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ 31 34 $(obj)/Image.gz System.map "$(INSTALL_PATH)" 32 - 33 - clean-files += *.dtb
+5
arch/arm64/boot/dts/Makefile
··· 1 + targets += dtbs 2 + 3 + dtbs: $(addprefix $(obj)/, $(dtb-y)) 4 + 5 + clean-files := *.dtb