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: Robert Richter <rrichter@cavium.com>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c81e0674e568a56633250fed32051ec4abf2fb4d..b61adfae29d16ae310c8b021df0f04170459d891 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -314,7 +314,7 @@ $(INSTALL_TARGETS):
 PHONY += dtbs dtbs_install
 
 dtbs: prepare scripts
-       $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@
+       $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE)
 
 dtbs_install:
        $(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e0d348b4d1fa95722ee6bb94b18a06bac414c390..6e784fac5798c5526070ca4c579336aec23288ee 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -517,13 +517,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
        dove-dove-db.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb
 
-targets += dtbs dtbs_install
-targets += $(dtb-y)
 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
+always         := $(dtb-y)
+clean-files    := *.dtb

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 8e9167a19b6b914a9b2a60698f8b5fcf5cff184b..1c43cec971b5cd7196b367d1917baa25a10078bd 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -73,7 +73,7 @@ zinstall install: vmlinux
 PHONY += dtbs dtbs_install
 
 dtbs: prepare scripts
-       $(Q)$(MAKE) $(build)=$(boot)/dts $@
+       $(Q)$(MAKE) $(build)=$(boot)/dts
 
 dtbs_install:
        $(Q)$(MAKE) $(dtbinst)=$(boot)/dts

diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 29ac5adf50aefa6086ebaa7f32c55012257ef0d7..aa28902c358265b55eeb1c9189f0035dd3b139df 100644 (file)
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -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_XGENE) += apm-mustang.dtb
 
-targets += dtbs dtbs_install
-targets += $(dtb-y)
-
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-
-clean-files := *.dtb
+always         := $(dtb-y)
+clean-files    := *.dtb