On Sat, 28 Sept 2024 at 03:20, Marek Vasut <ma...@denx.de> wrote: > > 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. > > Signed-off-by: Marek Vasut <ma...@denx.de> > --- > Cc: "NXP i.MX U-Boot Team" <uboot-...@nxp.com> > Cc: Caleb Connolly <caleb.conno...@linaro.org> > Cc: Christoph Niedermaier <cniederma...@dh-electronics.com> > Cc: Fabio Estevam <feste...@gmail.com> > Cc: Heinrich Schuchardt <xypron.g...@gmx.de> > Cc: Jonas Karlman <jo...@kwiboo.se> > Cc: Lothar Rubusch <l.rubu...@gmail.com> > Cc: Michal Simek <michal.si...@amd.com> > Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org> > Cc: Rasmus Villemoes <rasmus.villem...@prevas.dk> > Cc: Simon Glass <s...@chromium.org> > Cc: Stefano Babic <sba...@denx.de> > Cc: Sumit Garg <sumit.g...@linaro.org> > Cc: Tom Rini <tr...@konsulko.com> > Cc: u-b...@dh-electronics.com > Cc: u-boot@lists.denx.de > --- > arch/arc/dts/Makefile | 9 +-------- > arch/arm/dts/Makefile | 8 -------- > arch/m68k/dts/Makefile | 9 +-------- > arch/microblaze/dts/Makefile | 9 +-------- > arch/mips/dts/Makefile | 8 -------- > arch/nios2/dts/Makefile | 9 +-------- > arch/powerpc/dts/Makefile | 8 -------- > arch/riscv/dts/Makefile | 9 +-------- > arch/sandbox/dts/Makefile | 9 +-------- > arch/sh/dts/Makefile | 8 -------- > arch/x86/dts/Makefile | 8 -------- > arch/xtensa/dts/Makefile | 8 -------- > dts/upstream/src/arm/Makefile | 8 -------- > dts/upstream/src/arm64/Makefile | 8 -------- > dts/upstream/src/xtensa/Makefile | 8 -------- > scripts/Makefile.dts | 8 ++++++++ > 16 files changed, 14 insertions(+), 120 deletions(-) >
Reviewed-by: Sumit Garg <sumit.g...@linaro.org> -Sumit > diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile > index 532a8131c59..fe6ad7b849a 100644 > --- 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 cdb90f1d358..5976ebd09fc 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -1304,16 +1304,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 7988522eb98..8b354b9c570 100644 > --- 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 427a8f9aaca..9be902d3bb1 100644 > --- 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 14fbce597b9..752e771514f 100644 > --- 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 2b29fa90f6c..d77db9762a1 100644 > --- 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 321c644804e..766b0c05951 100644 > --- 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 c4c44057bad..f3dfd751cb4 100644 > --- 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 f810b4752f5..1c9fb4a4566 100644 > --- 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 144fd3e7d22..e9153e42534 100644 > --- 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 cd77f4c4e81..9a46726e026 100644 > --- 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 c22c50ac4e5..aa582b85e5c 100644 > --- 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 9a8f6aa3584..c86a2be5d85 100644 > --- 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 26a83d3d29d..b6db0dc6b26 100644 > --- 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 2a81acb32bc..c86a2be5d85 100644 > --- 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 790f3c508f1..1fe142f2bbf 100644 > --- 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 > -- > 2.45.2 >
