Commit d38726c4 authored by Robert Richter's avatar Robert Richter

dts, arm/arm64: Remove dtbs build rules in sub-makes

Add dtb files to build targets and let kbuild handle them. Thus,
special dtbs rules can be removed. This eases Makefiles and the
implementation of the support of vendor dtb subdirectories.
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
parent 9fb5e537
...@@ -314,7 +314,7 @@ $(INSTALL_TARGETS): ...@@ -314,7 +314,7 @@ $(INSTALL_TARGETS):
PHONY += dtbs dtbs_install PHONY += dtbs dtbs_install
dtbs: prepare scripts dtbs: prepare scripts
$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE)
dtbs_install: dtbs_install:
$(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE) $(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE)
......
...@@ -517,13 +517,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ ...@@ -517,13 +517,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
dove-dove-db.dtb dove-dove-db.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb
targets += dtbs dtbs_install
targets += $(dtb-y)
endif endif
# *.dtb used to be generated in the directory above. Clean out the always := $(dtb-y)
# old build results so people don't accidentally use them. clean-files := *.dtb
dtbs: $(addprefix $(obj)/, $(dtb-y))
$(Q)rm -f $(obj)/../*.dtb
clean-files := *.dtb
...@@ -73,7 +73,7 @@ zinstall install: vmlinux ...@@ -73,7 +73,7 @@ zinstall install: vmlinux
PHONY += dtbs dtbs_install PHONY += dtbs dtbs_install
dtbs: prepare scripts dtbs: prepare scripts
$(Q)$(MAKE) $(build)=$(boot)/dts $@ $(Q)$(MAKE) $(build)=$(boot)/dts
dtbs_install: dtbs_install:
$(Q)$(MAKE) $(dtbinst)=$(boot)/dts $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
......
...@@ -2,9 +2,5 @@ dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb ...@@ -2,9 +2,5 @@ dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
targets += dtbs dtbs_install always := $(dtb-y)
targets += $(dtb-y) clean-files := *.dtb
dtbs: $(addprefix $(obj)/, $(dtb-y))
clean-files := *.dtb
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment