Commit 1acf1cf8 authored by Rob Herring's avatar Rob Herring
Browse files

powerpc: build .dtb files in dts directory 



Align powerpc with other architectures which build the dtb files in the
same directory as the dts files. This is also in line with most other
build targets which are located in the same directory as the source.
This move will help enable the 'dtbs' target which builds all the dtbs
regardless of kernel config.

This transition could break some scripts if they expect dtb files in the
old location.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 57361846

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ bootwrapper_install: 
	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)



%.dtb: scripts

	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

	$(Q)$(MAKE) $(build)=$(boot)/dts $(patsubst %,$(boot)/dts/%,$@)



# Used to create 'merged defconfigs'

# To use it $(call) it with the first argument as the base defconfig

arch/powerpc/boot/Makefile

+26 −29
Original line number Diff line number Diff line
@@ -304,9 +304,9 @@ image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ 
					   dtbImage.adder875-redboot



# Board ports in arch/powerpc/platform/52xx/Kconfig

image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200 lite5200.dtb

image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200b lite5200b.dtb

image-$(CONFIG_PPC_MEDIA5200)		+= cuImage.media5200 media5200.dtb

image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200

image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200b

image-$(CONFIG_PPC_MEDIA5200)		+= cuImage.media5200



# Board ports in arch/powerpc/platform/82xx/Kconfig

image-$(CONFIG_MPC8272_ADS)		+= cuImage.mpc8272ads
@@ -381,11 +381,11 @@ $(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperb 
	$(call if_changed,wrap,$(subst $(obj)/zImage.,,$@))



# dtbImage% - a dtbImage is a zImage with an embedded device tree blob

$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE

	$(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)

$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/dts/%.dtb FORCE

	$(call if_changed,wrap,$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE

	$(call if_changed,wrap,$*,,$(obj)/$*.dtb)

$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/dts/%.dtb FORCE

	$(call if_changed,wrap,$*,,$(obj)/dts/$*.dtb)



# This cannot be in the root of $(src) as the zImage rule always adds a $(obj)

# prefix
@@ -395,36 +395,33 @@ $(obj)/vmlinux.strip: vmlinux 
$(obj)/uImage: vmlinux $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot)



$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)

$(obj)/uImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)

$(obj)/uImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb)



$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)

$(obj)/cuImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)

$(obj)/cuImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb)



$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)

$(obj)/simpleImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)

$(obj)/simpleImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/dts/$*.dtb)



$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)

$(obj)/treeImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,treeboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)



$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)

$(obj)/treeImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE

	$(call if_changed,wrap,treeboot-$*,,$(obj)/dts/$*.dtb)



# Rule to build device tree blobs

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

	$(call if_changed_dep,dtc)



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

	$(call if_changed_dep,dtc)

# Needed for the above targets to work with dts/fsl/ files

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

	@cp $< $@



# If there isn't a platform selected then just strip the vmlinux.

ifeq (,$(image-y))

arch/powerpc/boot/dts/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

CRA Git | Maintained and supported by SUSTech CRA and CCSE