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>
This commit is contained in:
parent
499cd82986
commit
da4cbc6d58
|
@ -54,7 +54,7 @@ zinstall install: vmlinux
|
||||||
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
|
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
|
||||||
|
|
||||||
%.dtb:
|
%.dtb:
|
||||||
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
|
||||||
|
|
||||||
# We use MRPROPER_FILES and CLEAN_FILES now
|
# We use MRPROPER_FILES and CLEAN_FILES now
|
||||||
archclean:
|
archclean:
|
||||||
|
|
|
@ -22,9 +22,6 @@ $(obj)/Image: vmlinux FORCE
|
||||||
$(obj)/Image.gz: $(obj)/Image FORCE
|
$(obj)/Image.gz: $(obj)/Image FORCE
|
||||||
$(call if_changed,gzip)
|
$(call if_changed,gzip)
|
||||||
|
|
||||||
$(obj)/%.dtb: $(src)/dts/%.dts
|
|
||||||
$(call cmd,dtc)
|
|
||||||
|
|
||||||
install: $(obj)/Image
|
install: $(obj)/Image
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
||||||
$(obj)/Image System.map "$(INSTALL_PATH)"
|
$(obj)/Image System.map "$(INSTALL_PATH)"
|
||||||
|
@ -32,5 +29,3 @@ install: $(obj)/Image
|
||||||
zinstall: $(obj)/Image.gz
|
zinstall: $(obj)/Image.gz
|
||||||
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
|
||||||
$(obj)/Image.gz System.map "$(INSTALL_PATH)"
|
$(obj)/Image.gz System.map "$(INSTALL_PATH)"
|
||||||
|
|
||||||
clean-files += *.dtb
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
targets += dtbs
|
||||||
|
|
||||||
|
dtbs: $(addprefix $(obj)/, $(dtb-y))
|
||||||
|
|
||||||
|
clean-files := *.dtb
|
Loading…
Reference in New Issue