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

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

c6x: use new common dtc rule 



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

This requires moving parts of arch/c6x/boot/Makefile into newly created
arch/c6x/boot/dts/Makefile, and updating arch/c6x/Makefile to call the
new Makefile. linked_dtb.S is also moved into boot/dts/ since it's used
by rules that were moved.

Acked-by: default avatarMark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: linux-c6x-dev@linux-c6x.org
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
parent 19fbd6b2

arch/c6x/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ DTB:=$(subst dtbImage.,,$(filter dtbImage.%, $(MAKECMDGOALS))) 
export DTB



ifneq ($(DTB),)

core-y	+= $(boot)/

core-y	+= $(boot)/dts/

endif



# With make 3.82 we cannot mix normal and wildcard targets

arch/c6x/boot/Makefile

+0 −20
Original line number Diff line number Diff line
@@ -6,25 +6,5 @@ OBJCOPYFLAGS_vmlinux.bin := -O binary 
$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



DTC_FLAGS ?= -p 1024



ifneq ($(DTB),)

obj-y += linked_dtb.o

endif



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

	$(call if_changed_dep,dtc)



quiet_cmd_cp = CP      $< $@$2

	cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)



# Generate builtin.dtb from $(DTB).dtb

$(obj)/builtin.dtb: $(obj)/$(DTB).dtb

	$(call if_changed,cp)



$(obj)/linked_dtb.o: $(obj)/builtin.dtb



$(obj)/dtbImage.%: vmlinux

	$(call if_changed,objcopy)
 


clean-files := $(obj)/*.dtb

arch/c6x/boot/dts/Makefile

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#

# Makefile for device trees

#



DTC_FLAGS ?= -p 1024



ifneq ($(DTB),)

obj-y += linked_dtb.o

endif



quiet_cmd_cp = CP      $< $@$2

	cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)



# Generate builtin.dtb from $(DTB).dtb

$(obj)/builtin.dtb: $(obj)/$(DTB).dtb

	$(call if_changed,cp)



$(obj)/linked_dtb.o: $(obj)/builtin.dtb



clean-files := *.dtb

arch/c6x/boot/linked_dtb.S→arch/c6x/boot/dts/linked_dtb.S

+2 −0
Original line number Diff line number Diff line 
.section __fdt_blob,"a"

.incbin "arch/c6x/boot/builtin.dtb"
 
.incbin "arch/c6x/boot/dts/builtin.dtb"