Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4cbc6d authored by Stephen Warren's avatar Stephen Warren Committed by Rob Herring
Browse files

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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
parent 499cd829

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ zinstall install: vmlinux 
	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.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

archclean:

arch/arm64/boot/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ $(obj)/Image: vmlinux FORCE 
$(obj)/Image.gz: $(obj)/Image FORCE

	$(call if_changed,gzip)



$(obj)/%.dtb: $(src)/dts/%.dts

	$(call cmd,dtc)



install: $(obj)/Image

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"
@@ -32,5 +29,3 @@ install: $(obj)/Image 
zinstall: $(obj)/Image.gz

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image.gz System.map "$(INSTALL_PATH)"
 


clean-files += *.dtb

arch/arm64/boot/dts/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
targets += dtbs



dtbs: $(addprefix $(obj)/, $(dtb-y))



clean-files := *.dtb