dts: Deduplicate dtbs target

The dtbs: target is almost identical in all architecture Makefiles.
All architecture Makefiles include scripts/Makefile.dts . Deduplicate
the dtbs: target into scripts/Makefile.dts . No functional change.

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Caleb Connolly <caleb.connolly@linaro.org> #qcom, OF_UPSTREAM

diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile
index 532a8131c599d64d7b7080e7cc04fd76f895e6fe..fe6ad7b849aa4abe0326a0ae05d25e12683923d1 100644 (file)
--- a/arch/arc/dts/Makefile
+++ b/arch/arc/dts/Makefile
@@ -10,12 +10,5 @@ dtb-$(CONFIG_TARGET_IOT_DEVKIT) +=  iot_devkit.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
+# Add any required device tree compiler flags here
 DTC_FLAGS += -R 4 -p 0x1000
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 123e121e7e70958d5eac697441e20a9065f348ec..8cbb5d8c0a6886500a8f20e1f8ea6460507290dc 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1306,16 +1306,8 @@ dtb-$(CONFIG_TARGET_CORSTONE1000) += corstone1000-mps3.dtb \
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS += -a 0x8
 
 DTC_FLAGS_imx8mp-dhcom-som-overlay-rev100 += -Wno-avoid_default_addr_size -Wno-reg_format
 DTC_FLAGS_imx8mp-dhcom-pdk3-overlay-rev100 += -Wno-avoid_default_addr_size -Wno-reg_format
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb *.dtbo *_HS

diff --git a/arch/m68k/dts/Makefile b/arch/m68k/dts/Makefile
index 7988522eb98c283b7216b94a168d516fd74f7e8b..8b354b9c570c9eb2aa610b735ee5552daa8103a8 100644 (file)
--- a/arch/m68k/dts/Makefile
+++ b/arch/m68k/dts/Makefile
@@ -20,12 +20,5 @@ dtb-$(CONFIG_TARGET_STMARK2) += stmark2.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
+# Add any required device tree compiler flags here
 DTC_FLAGS += -R 4 -p 0x1000
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/microblaze/dts/Makefile b/arch/microblaze/dts/Makefile
index 427a8f9aaca35f70923a6c15813b5cbb9ec1c6ef..9be902d3bb1380365779e0d1767d17dce9de67b0 100644 (file)
--- a/arch/microblaze/dts/Makefile
+++ b/arch/microblaze/dts/Makefile
@@ -4,12 +4,5 @@ dtb-y += $(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)).dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
+# Add any required device tree compiler flags here
 DTC_FLAGS += -R 4 -p 0x1000
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
index 14fbce597b9ea3a32614f6259049655e4639ab97..752e771514fc6bc59791415328890be37f6f14d6 100644 (file)
--- a/arch/mips/dts/Makefile
+++ b/arch/mips/dts/Makefile
@@ -39,13 +39,5 @@ dtb-$(CONFIG_SOC_SERVAL) += serval_pcb105.dtb serval_pcb106.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS +=
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/nios2/dts/Makefile b/arch/nios2/dts/Makefile
index 2b29fa90f6c810e19b3fab9c4e8ba7f6ab86086f..d77db9762a1d20373009b8f825a0d3839468b0a6 100644 (file)
--- a/arch/nios2/dts/Makefile
+++ b/arch/nios2/dts/Makefile
@@ -4,12 +4,5 @@ dtb-y += $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%).dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
+# Add any required device tree compiler flags here
 DTC_FLAGS += -R 4 -p 0x1000
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile
index 321c644804e4aa2b4543392280fe0c34c4389575..766b0c05951490c819a3005a1f4ddc149046545b 100644 (file)
--- a/arch/powerpc/dts/Makefile
+++ b/arch/powerpc/dts/Makefile
@@ -35,13 +35,5 @@ dtb-$(CONFIG_TARGET_CMPCPRO) += cmpcpro.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS +=
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile
index c4c44057badd9b7cfd88127e78bffb68672b6705..f3dfd751cb4c3bc32888afe1aea7cf1563cc5fe7 100644 (file)
--- a/arch/riscv/dts/Makefile
+++ b/arch/riscv/dts/Makefile
@@ -15,12 +15,5 @@ dtb-$(CONFIG_TARGET_ASPEED_AST2700_IBEX) += ast2700-ibex.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
+# Add any required device tree compiler flags here
 DTC_FLAGS += -R 4 -p 0x1000
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile
index f810b4752f5aafe5e6e618be7fdce170597443cb..1c9fb4a45669fecd356acc7d48c3ba931c400154 100644 (file)
--- a/arch/sandbox/dts/Makefile
+++ b/arch/sandbox/dts/Makefile
@@ -10,12 +10,5 @@ dtb-$(CONFIG_CMD_EXTENSION) += overlay0.dtbo overlay1.dtbo
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
+# Add any required device tree compiler flags here
 DTC_FLAGS += -R 4 -p 0x1000
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb *.dtbo

diff --git a/arch/sh/dts/Makefile b/arch/sh/dts/Makefile
index 144fd3e7d2242f47203884c3cf28511e464648cb..e9153e4253454697a4ade619a39db548f62b4ddc 100644 (file)
--- a/arch/sh/dts/Makefile
+++ b/arch/sh/dts/Makefile
@@ -2,13 +2,5 @@ dtb-y += sh7751-r2dplus.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS +=
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb *_HS

diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile
index cd77f4c4e814629bbb3d2abce5fee615e0821701..9a46726e0266bfaf44ddef498dfae6d40ab576da 100644 (file)
--- a/arch/x86/dts/Makefile
+++ b/arch/x86/dts/Makefile
@@ -24,12 +24,4 @@ dtb-y += bayleybay.dtb \
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 DTC_FLAGS += -R 4 -p $(if $(CONFIG_EFI_APP),0x8000,0x1000)
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/arch/xtensa/dts/Makefile b/arch/xtensa/dts/Makefile
index c22c50ac4e5d7aebac6499a994668fbd48ddf385..aa582b85e5cbe967be1f4432d15ad99c1b0924b3 100644 (file)
--- a/arch/xtensa/dts/Makefile
+++ b/arch/xtensa/dts/Makefile
@@ -4,12 +4,4 @@ dtb-$(CONFIG_XTENSA) += ml605.dtb ml605_nommu.dtb kc705.dtb kc705_nommu.dtb
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 DTC_FLAGS +=
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb

diff --git a/dts/upstream/src/arm/Makefile b/dts/upstream/src/arm/Makefile
index 9a8f6aa35846c4ca97f98c598f3d0858568c7456..c86a2be5d858302bf6b18e8229f7a596e115f072 100644 (file)
--- a/dts/upstream/src/arm/Makefile
+++ b/dts/upstream/src/arm/Makefile
@@ -2,13 +2,5 @@
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS += -a 0x8
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := */*.dtb */*.dtbo

diff --git a/dts/upstream/src/arm64/Makefile b/dts/upstream/src/arm64/Makefile
index 26a83d3d29d97f65f4577f86ed29c72b9dba01f7..b6db0dc6b26ec2d7064e8880574c268bce01382c 100644 (file)
--- a/dts/upstream/src/arm64/Makefile
+++ b/dts/upstream/src/arm64/Makefile
@@ -2,17 +2,9 @@
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS += -a 0x8
 
 ifdef CONFIG_RCAR_64
 DTC_FLAGS += -R 4 -p 0x1000
 endif
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := */*.dtb */*.dtbo

diff --git a/dts/upstream/src/xtensa/Makefile b/dts/upstream/src/xtensa/Makefile
index 2a81acb32bc3ec329a758949cf36ee0c835e5287..c86a2be5d858302bf6b18e8229f7a596e115f072 100644 (file)
--- a/dts/upstream/src/xtensa/Makefile
+++ b/dts/upstream/src/xtensa/Makefile
@@ -2,13 +2,5 @@
 
 include $(srctree)/scripts/Makefile.dts
 
-targets += $(dtb-y)
-
 # Add any required device tree compiler flags here
 DTC_FLAGS += -a 0x8
-
-PHONY += dtbs
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-       @:
-
-clean-files := *.dtb *.dtbo */*.dtb */*.dtbo

diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts
index 790f3c508f19c5d13ded8edcf78adaa888fcdbe9..1fe142f2bbf78efb861ec1e3af8c048f4f5967ee 100644 (file)
--- a/scripts/Makefile.dts
+++ b/scripts/Makefile.dts
@@ -14,3 +14,11 @@ dtb-vendor_dts := $(patsubst %.dts,%.dtb,$(wildcard $(dt_dir)/$(subst ",,$(CONFI
 dtb-y += $(subst $(dt_dir)/,,$(dtb-vendor_dts))
 
 endif
+
+targets += $(dtb-y)
+
+PHONY += dtbs
+dtbs: $(addprefix $(obj)/, $(dtb-y))
+       @:
+
+clean-files := *.dtb *.dtbo */*.dtb */*.dtbo *_HS