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

Commit 499cd829 authored by Grant Likely's avatar Grant Likely Committed by Rob Herring
Browse files

ARM: dt: change .dtb build rules to build in dts directory 



The current rules have the .dtb files build in a different directory
from the .dts files. The only reason for this is that it was what
PowerPC has done historically. This patch changes ARM to use the generic
dtb rule which builds .dtb files in the same directory as the source .dts.

Cc: Russell King <linux@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
[swarren: added rm command for old stale .dtb files]
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
parent 90b335fb

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -292,10 +292,10 @@ zinstall uinstall install: vmlinux 
	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb: scripts

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@



dtbs: scripts

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs



# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

arch/arm/boot/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ ifneq ($(MACHINE),) 
include $(srctree)/$(MACHINE)/Makefile.boot

endif



include $(srctree)/arch/arm/boot/dts/Makefile



# Note: the following conditions must always be true:

#   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

#   PARAMS_PHYS must be within 4MB of ZRELADDR
@@ -59,16 +57,6 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE 


endif



targets += $(dtb-y)



# Rule to build device tree blobs

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

	$(call if_changed_dep,dtc)



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



clean-files := *.dtb



ifneq ($(LOADADDR),)

  UIMAGE_LOADADDR=$(LOADADDR)

else

arch/arm/boot/dts/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -104,4 +104,12 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ 
	wm8505-ref.dtb \

	wm8650-mid.dtb



targets += dtbs

endif



# *.dtb used to be generated in the directory above. Clean out the

# old build results so people don't accidentally use them.

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

	$(Q)rm -f $(obj)/../*.dtb



clean-files := *.dtb