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

Commit 25fff6aa authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'all-dtbs-v2' into for-next

parents 3f5ceec9 99085704

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ $(boot_targets): vmlinux 
	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@



dtbs: scripts

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

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



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/arc/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -6,10 +6,12 @@ ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"") 
endif



obj-y   += $(builtindtb-y).dtb.o

targets += $(builtindtb-y).dtb

dtb-y := $(builtindtb-y).dtb



.SECONDARY: $(obj)/$(builtindtb-y).dtb.S



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

dtstree		:= $(srctree)/$(src)

dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))



always := $(dtb-y)

clean-files := *.dtb  *.dtb.S

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -740,5 +740,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

endif



dtstree		:= $(srctree)/$(src)

dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))



always		:= $(dtb-y)

clean-files	:= *.dtb

arch/arm64/boot/dts/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -14,3 +14,9 @@ dts-dirs += sprd 
dts-dirs += xilinx



subdir-y	:= $(dts-dirs)



dtstree		:= $(srctree)/$(src)



dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))



always		:= $(dtb-y)

arch/h8300/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -8,5 +8,8 @@ dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb 
dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb

dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb



dtstree		:= $(srctree)/$(src)

dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))



always	    := $(dtb-y)

clean-files := *.dtb.S *.dtb